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/service/impl/MouldFileServiceImpl.java

@@ -28,6 +28,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -248,6 +249,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         MouldFile mf = new MouldFile();
         mf.setId(mouldFileId);
         MouldFile oldData = mouldFileMapper.selectById(mouldFileId);
+        Mould md = mouldMapper.selectById(oldData.getModelId());
+        String approverNames = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("project_id", md.getProjectId()))
+                .stream().map(ProjectApprove::getApproverName).collect(Collectors.joining(","));
         MouldOperationDynamics dynamics = new MouldOperationDynamics();
         if (user != null) {
             if (user.getSubordinateType() == 0) {
@@ -275,18 +279,28 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 }
                 mouldFileMapper.updateById(mf);
                 if (oldData.getBlongType() == 4) {
-                    //审批的是模具报废文件
-                    Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>()
-                            .eq("belong_type", 4).eq("is_pass", dynamics.getIsPass()).eq("mould_id", oldData.getModelId()));
-                    if (count != 0) {
-                        return msg;
+                    if(mf.getState()==3){
+                        dynamics.setMouldId(oldData.getModelId());
+                        dynamics.setApplicantName(approverNames);
+                        dynamics.setApplicantId(mf.getUplodtorId());
+                        dynamics.setApplicantName(mf.getUploadtor());
+                        dynamics.setBelongType(oldData.getBlongType());
+                        dynamics.setContent(Constant.APPROVAL);
+                        dynamics.setOperatorId(user.getId());
+                        dynamics.setOperatorName(user.getUsername());
+                        dynamics.setIsPass(1);
+                        mouldOperationDynamicsMapper.insert(dynamics);
+                    }else if(mf.getState() < 0){
+                        dynamics.setMouldId(oldData.getModelId());
+                        dynamics.setApplicantName(approverNames);
+                        dynamics.setApplicantId(mf.getUplodtorId());
+                        dynamics.setApplicantName(mf.getUploadtor());
+                        dynamics.setBelongType(oldData.getBlongType());
+                        dynamics.setContent(Constant.APPROVAL);
+                        dynamics.setOperatorId(user.getId());
+                        dynamics.setOperatorName(user.getUsername());
+                        mouldOperationDynamicsMapper.insert(dynamics);
                     }
-                    dynamics.setMouldId(oldData.getModelId());
-                    dynamics.setBelongType(oldData.getBlongType());
-                    dynamics.setContent(Constant.APPROVAL);
-                    dynamics.setOperatorId(user.getId());
-                    dynamics.setOperatorName(user.getUsername());
-                    mouldOperationDynamicsMapper.insert(dynamics);
                 } else {
                     //添加审批记录
                     dynamics.setMouldId(oldData.getModelId());
@@ -326,18 +340,28 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 }
                 mouldFileMapper.updateById(mf);
                 if (oldData.getBlongType() == 4) {
-                    //审批的是模具报废文件
-                    Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>()
-                            .eq("belong_type", 4).eq("is_pass", dynamics.getIsPass()).eq("mould_id", oldData.getModelId()));
-                    if (count != 0) {
-                        return msg;
+                    if(mf.getState()==3){
+                        dynamics.setMouldId(oldData.getModelId());
+                        dynamics.setApplicantName(approverNames);
+                        dynamics.setApplicantId(mf.getUplodtorId());
+                        dynamics.setApplicantName(mf.getUploadtor());
+                        dynamics.setBelongType(oldData.getBlongType());
+                        dynamics.setContent(Constant.APPROVAL);
+                        dynamics.setOperatorId(user.getId());
+                        dynamics.setOperatorName(user.getUsername());
+                        dynamics.setIsPass(1);
+                        mouldOperationDynamicsMapper.insert(dynamics);
+                    }else if(mf.getState() < 0){
+                        dynamics.setMouldId(oldData.getModelId());
+                        dynamics.setApplicantName(approverNames);
+                        dynamics.setApplicantId(mf.getUplodtorId());
+                        dynamics.setApplicantName(mf.getUploadtor());
+                        dynamics.setBelongType(oldData.getBlongType());
+                        dynamics.setContent(Constant.APPROVAL);
+                        dynamics.setOperatorId(user.getId());
+                        dynamics.setOperatorName(user.getUsername());
+                        mouldOperationDynamicsMapper.insert(dynamics);
                     }
-                    dynamics.setMouldId(oldData.getModelId());
-                    dynamics.setBelongType(oldData.getBlongType());
-                    dynamics.setContent(Constant.APPROVAL);
-                    dynamics.setOperatorId(user.getId());
-                    dynamics.setOperatorName(user.getUsername());
-                    mouldOperationDynamicsMapper.insert(dynamics);
                 }else{
                     //添加审批记录
                     dynamics.setMouldId(oldData.getModelId());