修改模具筛选

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

@@ -31,7 +31,7 @@ public class ProjectController{
     /**
      * 添加/修改项目
      * 参数：projectName 项目名 ,customerCompanyIds 客户方公司ids "1,2,3",customerCompanyNames 客户方公司名字“1,2,3”
-     * managerId 项目经理id  managerName 项目经理name
+     * managerId 项目经理id  manager 项目经理name
      * 修改时/添加时分配项目: id 项目id ，userIds 参与项目的用户id 如：“1,2,3”(多个或者一个)()
      * managerId 项目经理id 非必传，managerId 项目经理  modelIds 模具ids 如 :"1,2,3"
      * flag 0-添加，1-修改
@@ -92,5 +92,17 @@ public class ProjectController{
         msg = projectService.getListByUser(token);
         return msg;
     }
+
+//    /**
+//     * 设置审批人
+//     * 参数: token 用户身份凭证
+//     * @return
+//     */
+//    @ApiOperation("项目详情")
+//    @RequestMapping("/setUpExamine")
+//    @ResponseBody
+//    public HttpRespMsg setUpExamine(){
+//
+//    }
 }
 

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

@@ -22,4 +22,5 @@ public class MouldVO extends Mould {
     private String equipmentNo;
     private String hillNumber;
     private String ownerCompanyName;
+    private String companyName;
 }

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_mould");
+        strategy.setInclude("tb_project_approve");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -63,6 +63,7 @@
         <result column="endTime" property="endTime"/>
         <result column="hillNumber" property="hillNumber"/>
         <result column="ownerCompanyName" property="ownerCompanyName"/>
+        <result column="companyName" property="companyName"/>
     </resultMap>
 
     <update id="updateMouldByProjectId">
@@ -71,8 +72,8 @@
 
     <select id="selectListByCondition" resultMap="BaseResultMapVO">
         select
-        tbm.id id,tbm.model_no model_no, tbm.model_name,
-        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,
+        tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,
+        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName
         from
@@ -84,12 +85,16 @@
         left join
         tb_project tbp
         on tbp.id = tbm.project_id
+        left join
+        tb_company tbc
+        on
+        tbc.id = tbm.company_id
         <where>
             <if test="userVO.parentId != 0">
                 tbm.company_id = #{userVO.companyId}
             </if>
             <if test="userVO.serchType == 0">
-                AND tbp.model_no like concat('%',#{userVO.keyName},'%')
+                AND tbm.model_no like concat('%',#{userVO.keyName},'%')
             </if>
             <if test="userVO.serchType == 1">
                 AND tbm.model_name like concat('%',#{userVO.keyName},'%')
@@ -102,7 +107,7 @@
     <select id="selectListByConditionByProject" resultMap="BaseResultMapVO">
         select
         tbm.id id,tbm.model_no model_no, tbm.model_name, tbmp.end_time endTime,tbm.state state,tbp.project_name
-        projectName,
+        projectName,tbm.initial_modulus initial_modulus,tbc.company_name companyName,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.equipment_no
         equipmentNo,tbm.setting_life setting_life
         from
@@ -113,10 +118,15 @@
         tbm.equipment_id = tbmp.id
         left join
         tb_project tbp
-        on tbp.id = tbm.project_id
+        on
+        tbp.id = tbm.project_id
+        left join
+        tb_company tbc
+        on
+        tbc.id = tbm.company_id
         <where>
             <if test="userVO.serchType == 0">
-                AND tbp.model_no like concat('%',#{userVO.keyName},'%')
+                AND tbm.model_no like concat('%',#{userVO.keyName},'%')
             </if>
             <if test="userVO.serchType == 1">
                 AND tbm.model_name like concat('%',#{userVO.keyName},'%')