Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

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

@@ -55,7 +55,7 @@ public class MouldController {
 
     /**
      * 给项目分配模具获取该公司下的模具列表
-     * parentId 当前人parentId
+     * parentId 当前人parentId ,id当前人id
      * @return
      */
     @ApiOperation("获取该公司下的模具列表")

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

@@ -94,7 +94,5 @@ public class MouldEquipmentController {
         msg = mouldEquipmentService.getList(user,page);
         return msg;
     }
-
-
 }
 

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

@@ -25,6 +25,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
     MouldMapper mouldMapper;
     @Override
     public HttpRespMsg addAndUpdateMould(Mould mould, User user) {
+        HttpRespMsg msg = new HttpRespMsg();
         if(mould.getId() != null){
             //修改
             mouldMapper.updateById(mould);
@@ -32,6 +33,6 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             mould.setCreatorId(user.getId());
             mouldMapper.insert(mould);
         }
-        return null;
+        return msg;
     }
 }

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

@@ -243,7 +243,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 //                if(){
 //
 //                }
-                //充当普通人员参与的项目
+//                //充当普通人员参与的项目
 
             }
         }else{

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

@@ -62,10 +62,16 @@
     </update>
 
     <select id="selectListByCondition" resultMap="BaseResultMapVO">
-        select model_no
+        select
+          tbm.model_no model_no, tbm.model_name, tbmp.end_time,tbm.state,tbm.project_name,manger_name,factory_name,area,equipment_no
         from
-          tb_mould
+          tb_mould tbm
         left join
+          tb_mould_equipment tbmp
+        on
+          tbm.equipment_id = tbmp.id
+        left join
+
 
     </select>
 </mapper>