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/MouldFileController.java

@@ -75,6 +75,22 @@ public class MouldFileController {
         return msg;
     }
 
+    /**
+     * 模具更新前的检查操作
+     * 参数: token 用户身份凭证，
+     * mouldId 模具id ,
+     *
+     * @return
+     */
+    @ApiOperation("模具更新前的检查操作")
+    @RequestMapping("/mouldUpdateCheck")
+    @ResponseBody
+    public HttpRespMsg mouldUpdateCheck(UserVO userVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = mouldFileService.mouldUpdateCheck(userVO);
+        return msg;
+    }
+
     /**
      * 零件文档的批量上传(文件命名规则：零件编号+2D/3D  如 LJ001+2D.dwg)
      * 参数: token 用户身份凭证，

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

@@ -32,4 +32,6 @@ public interface MouldFileService extends IService<MouldFile> {
     HttpRespMsg dowloadFileList(UserVO userVO, HttpServletRequest request, HttpServletResponse response,String downloadPath,String path) throws IOException;
     HttpRespMsg addPartFile(UserVO userVO, String path, MultipartFile[] files);
     HttpRespMsg downloadFileListExcel(UserVO userVO, HttpServletResponse response) throws ParseException;
+
+    HttpRespMsg mouldUpdateCheck(UserVO userVO);
 }

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

@@ -280,26 +280,29 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 mouldFileMapper.updateById(mf);
                 if (oldData.getBlongType() == 4) {
                     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);
+                        Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>().eq("belongType", 4).eq("is_pass", 1).eq("mould_id", oldData.getModelId()));
+                        if(count == 0){
+                            dynamics.setMouldId(oldData.getModelId());
+                            dynamics.setApplicantName(oldData.getUploadtor());
+                            dynamics.setApplicantId(oldData.getUplodtorId());
+                            dynamics.setApplicantName(mf.getUploadtor());
+                            dynamics.setBelongType(oldData.getBlongType());
+                            dynamics.setContent(Constant.APPROVAL);
+                            dynamics.setOperatorName(approverNames);
+                            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);
+                        Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>().eq("belongType", 4).eq("is_pass", 0).eq("mould_id", oldData.getModelId()));
+                        if(count == 0){
+                            dynamics.setApplicantName(oldData.getUploadtor());
+                            dynamics.setApplicantId(oldData.getUplodtorId());
+                            dynamics.setApplicantName(mf.getUploadtor());
+                            dynamics.setBelongType(oldData.getBlongType());
+                            dynamics.setContent(Constant.APPROVAL);
+                            dynamics.setOperatorName(approverNames);
+                            mouldOperationDynamicsMapper.insert(dynamics);
+                        }
                     }
                 } else {
                     //添加审批记录
@@ -341,26 +344,29 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 mouldFileMapper.updateById(mf);
                 if (oldData.getBlongType() == 4) {
                     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);
+                        Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>().eq("belongType", 4).eq("is_pass", 1).eq("mould_id", oldData.getModelId()));
+                        if(count == 0){
+                            dynamics.setMouldId(oldData.getModelId());
+                            dynamics.setApplicantName(oldData.getUploadtor());
+                            dynamics.setApplicantId(oldData.getUplodtorId());
+                            dynamics.setApplicantName(mf.getUploadtor());
+                            dynamics.setBelongType(oldData.getBlongType());
+                            dynamics.setContent(Constant.APPROVAL);
+                            dynamics.setOperatorName(approverNames);
+                            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);
+                        Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>().eq("belongType", 4).eq("is_pass", 0).eq("mould_id", oldData.getModelId()));
+                        if(count == 0){
+                            dynamics.setApplicantName(oldData.getUploadtor());
+                            dynamics.setApplicantId(oldData.getUplodtorId());
+                            dynamics.setApplicantName(mf.getUploadtor());
+                            dynamics.setBelongType(oldData.getBlongType());
+                            dynamics.setContent(Constant.APPROVAL);
+                            dynamics.setOperatorName(approverNames);
+                            mouldOperationDynamicsMapper.insert(dynamics);
+                        }
                     }
                 }else{
                     //添加审批记录
@@ -663,6 +669,27 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         return msg;
     }
 
+    @Override
+    public HttpRespMsg mouldUpdateCheck(UserVO userVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
+        boolean isCanCreate = false;
+        if (user == null) {
+            msg.setError("用户不存在或者未登录");
+        }else{
+            MouldOperationDynamics dynamics = mouldOperationDynamicsMapper.selectOne(new QueryWrapper<MouldOperationDynamics>().eq("belongType", 4).eq("mould_id", userVO.getMouldId()).orderByDesc("id"));
+            if(null != dynamics){
+                if(0 == dynamics.getIsPass()){
+                    isCanCreate = true;
+                }
+            }else{
+                isCanCreate = true;
+            }
+        }
+        msg.data = isCanCreate;
+        return msg;
+    }
+
 
     public Map<String, Object> feedBackDirectMultiDownload(HttpServletRequest request, HttpServletResponse response, String downloadPath, Mould vo, List<MouldFile> mouldFiles, String oldFilePath) throws IOException {
         //压缩文件初始设置