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

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

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

@@ -39,7 +39,7 @@ public class ProjectController {
     /**
      * 添加/修改项目
      * 参数：projectName 项目名 ,customerCompanyIds 客户方公司ids "1,2,3",customerCompanyNames 客户方公司名字“1,2,3”
-     *
+     * modelIds 模具ids 如 :"1,2,3"
      * 修改时/添加时分配项目: id 项目id ，userIds 参与项目的用户id 如：“1,2,3”(多个或者一个)()
      * customerApproverId 生产方审批人id，ownerApproverId 资产方审批人id
      * managerId 项目经理id  ,manager 项目经理name  ,modelIds 模具ids 如 :"1,2,3"

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

@@ -249,9 +249,6 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         //审批通过
                         dynamics.setIsPass(1);
                         //模具更新的审批
-                        if(oldData.getBlongType()==4){
-
-                        }
                         //审批的是模具报废文件
                         if(oldData.getBlongType()==5){
                             //将模具修改为已报废
@@ -269,19 +266,24 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     dynamics.setIsPass(0);
                 }
                 mouldFileMapper.updateById(mf);
-                //添加审批记录
-                dynamics.setMouldId(oldData.getId());
-                dynamics.setBelongType(oldData.getBlongType());
-                dynamics.setFileId(oldData.getId());
-                if(null != oldData.getFileName2()){
-                    dynamics.setFileName(oldData.getFileName()+","+oldData.getFileName2());
+                if(oldData.getBlongType()==4){
+
                 }else{
-                    dynamics.setFileName(oldData.getFileName());
+                        //添加审批记录
+                    dynamics.setMouldId(oldData.getId());
+                    dynamics.setBelongType(oldData.getBlongType());
+                    dynamics.setFileId(oldData.getId());
+                    if(null != oldData.getFileName2()){
+                        dynamics.setFileName(oldData.getFileName()+","+oldData.getFileName2());
+                    }else{
+                        dynamics.setFileName(oldData.getFileName());
+                    }
+                    dynamics.setOperatorId(user.getId());
+                    dynamics.setOperatorName(user.getUsername());
+                    dynamics.setContent(Constant.APPROVAL);
+                    mouldOperationDynamicsMapper.insert(dynamics);
                 }
-                dynamics.setOperatorId(user.getId());
-                dynamics.setOperatorName(user.getUsername());
-                dynamics.setContent(Constant.APPROVAL);
-                mouldOperationDynamicsMapper.insert(dynamics);
+
             } else if (user.getSubordinateType() == 1) {
                 //生产方
                 if (isPass == 1) {

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

@@ -92,6 +92,20 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             index++;
                         }
                     }
+                    //添加模具
+                    if (modelIds != null && !"".equals(modelIds)) {
+                        List<Integer> modelList = ListUtil.convertIntegerIdsArrayToList(modelIds);
+                        int index = 1;
+                        if (modelList.size() > 0) {
+                            for (Integer id : modelList) {
+                                Mould mould = new Mould();
+                                mould.setId(id);
+                                mould.setProjectId(project.getId());
+                                mould.setBelongProjectGrade(index / modelList.size() + "");
+                                mouldMapper.updateById(mould);
+                            }
+                        }
+                    }
                 }
             } else if (flag == 1) {
                 projectMapper.updateById(project);