修改模具筛选

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldController.java

@@ -75,6 +75,7 @@ public class MouldController {
     @RequestMapping("/list")
     @ResponseBody
     public HttpRespMsg list(UserVO userVO, PageUtil page,String token) {
+        System.out.println("keyName"+userVO.getKeyName());
         HttpRespMsg msg = new HttpRespMsg();
         User user = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
         BeanUtils.copyProperties(user,userVO);

cloud-model/src/main/java/com/hssx/cloudmodel/controller/ProjectApproveController.java

@@ -0,0 +1,37 @@
+package com.hssx.cloudmodel.controller;
+
+
+import com.hssx.cloudmodel.entity.ProjectApprove;
+import com.hssx.cloudmodel.service.ProjectApproveService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+
+/**
+ * @author 吴涛涛
+ * @since 2019-08-05
+ */
+@Controller
+@RequestMapping("/projectapprove")
+public class ProjectApproveController {
+
+    @Autowired
+    private ProjectApproveService projectApproveService;
+//        /**
+//     * 设置审批人
+//     * 参数: token 用户身份凭证,approverId 审批人id,approverName 审批人名字
+//     * @return
+//     */
+//    @ApiOperation("设置审批人")
+//    @RequestMapping("/setUpExamine")
+//    @ResponseBody
+//    public HttpRespMsg setUpExamine(ProjectApprove projectApprove){
+//
+//    }
+
+}
+

cloud-model/src/main/java/com/hssx/cloudmodel/controller/ProjectController.java

@@ -93,16 +93,5 @@ public class ProjectController{
         return msg;
     }
 
-//    /**
-//     * 设置审批人
-//     * 参数: token 用户身份凭证
-//     * @return
-//     */
-//    @ApiOperation("项目详情")
-//    @RequestMapping("/setUpExamine")
-//    @ResponseBody
-//    public HttpRespMsg setUpExamine(){
-//
-//    }
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/ProjectApprove.java

@@ -0,0 +1,139 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-08-05
+ */
+@TableName("tb_project_approve")
+public class ProjectApprove extends Model<ProjectApprove> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 项目审批人表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 审批人id
+     */
+    @TableField("approver_id")
+    private Integer approverId;
+
+    /**
+     * 审批人姓名
+     */
+    @TableField("approver_name")
+    private String approverName;
+
+    /**
+     * 公司id
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
+    /**
+     * 公司名称
+     */
+    @TableField("company_name")
+    private String companyName;
+
+    /**
+     * 所属方0-资产方 1-生产方
+     */
+    @TableField("subordinate_type")
+    private Integer subordinateType;
+
+    /**
+     * 项目id
+     */
+    @TableField("project_id")
+    private Integer projectId;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getApproverId() {
+        return approverId;
+    }
+
+    public void setApproverId(Integer approverId) {
+        this.approverId = approverId;
+    }
+
+    public String getApproverName() {
+        return approverName;
+    }
+
+    public void setApproverName(String approverName) {
+        this.approverName = approverName;
+    }
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public Integer getSubordinateType() {
+        return subordinateType;
+    }
+
+    public void setSubordinateType(Integer subordinateType) {
+        this.subordinateType = subordinateType;
+    }
+
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ProjectApprove{" +
+        "id=" + id +
+        ", approverId=" + approverId +
+        ", approverName=" + approverName +
+        ", companyId=" + companyId +
+        ", companyName=" + companyName +
+        ", subordinateType=" + subordinateType +
+        ", projectId=" + projectId +
+        "}";
+    }
+}

cloud-model/src/main/java/com/hssx/cloudmodel/entity/User.java

@@ -115,7 +115,7 @@ public class User extends Model<User> {
     private String teamName;
 
     /**
-     * 所属方，-1-超级管理员,0-供应商 1-客户方
+     * 所属方，-1-超级管理员,0-资产方 1-生产方
      */
     @TableField("subordinate_type")
     private Integer subordinateType;

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/UserVO.java

@@ -12,7 +12,7 @@ public class UserVO extends User {
     private String companyName;
     private String roleName;
     private String keyName;//项目名称
-    private Integer serchType;//搜索类型0-模具编号，1-模具名称
+    private Integer searchType;//搜索类型0-模具编号，1-模具名称
     private Integer projectId;
 
     public Integer getProjectId() {
@@ -31,12 +31,12 @@ public class UserVO extends User {
         this.keyName = keyName;
     }
 
-    public Integer getSerchType() {
-        return serchType;
+    public Integer getSearchType() {
+        return searchType;
     }
 
-    public void setSerchType(Integer serchType) {
-        this.serchType = serchType;
+    public void setSearchType(Integer searchType) {
+        this.searchType = searchType;
     }
 
     public String getCompanyName() {

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/ProjectApproveMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.ProjectApprove;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-08-05
+ */
+public interface ProjectApproveMapper extends BaseMapper<ProjectApprove> {
+
+}

cloud-model/src/main/java/com/hssx/cloudmodel/service/ProjectApproveService.java

@@ -0,0 +1,12 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.ProjectApprove;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author 吴涛涛
+ * @since 2019-08-05
+ */
+public interface ProjectApproveService extends IService<ProjectApprove> {
+
+}

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectApproveServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.ProjectApprove;
+import com.hssx.cloudmodel.mapper.ProjectApproveMapper;
+import com.hssx.cloudmodel.service.ProjectApproveService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author 吴涛涛
+ * @since 2019-08-05
+ */
+@Service
+public class ProjectApproveServiceImpl extends ServiceImpl<ProjectApproveMapper, ProjectApprove> implements ProjectApproveService {
+
+    @Resource
+    ProjectApproveMapper projectApproveMapper;
+}

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -93,10 +93,10 @@
             <if test="userVO.parentId != 0">
                 tbm.company_id = #{userVO.companyId}
             </if>
-            <if test="userVO.serchType == 0">
+            <if test="userVO.searchType == 0">
                 AND tbm.model_no like concat('%',#{userVO.keyName},'%')
             </if>
-            <if test="userVO.serchType == 1">
+            <if test="userVO.searchType == 1">
                 AND tbm.model_name like concat('%',#{userVO.keyName},'%')
             </if>
             <if test="userVO.projectId != -1">
@@ -125,10 +125,10 @@
         on
         tbc.id = tbm.company_id
         <where>
-            <if test="userVO.serchType == 0">
+            <if test="userVO.searchType == 0">
                 AND tbm.model_no like concat('%',#{userVO.keyName},'%')
             </if>
-            <if test="userVO.serchType == 1">
+            <if test="userVO.searchType == 1">
                 AND tbm.model_name like concat('%',#{userVO.keyName},'%')
             </if>
             AND tbm.project_id in

cloud-model/src/main/resources/mapper/ProjectApproveMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.ProjectApproveMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.ProjectApprove">
+        <id column="id" property="id" />
+        <result column="approver_id" property="approverId" />
+        <result column="approver_name" property="approverName" />
+        <result column="company_id" property="companyId" />
+        <result column="company_name" property="companyName" />
+        <result column="subordinate_type" property="subordinateType" />
+        <result column="project_id" property="projectId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, approver_id, approver_name, company_id, company_name, subordinate_type, project_id
+    </sql>
+
+</mapper>