优化代码结构

wisenergy-mapper/src/main/resources/mapper/WorkProjectMapper.xml

@@ -91,7 +91,9 @@
             <if test="null != projectName">
                 project_name = #{projectName},
             </if>
-            modify_time = now()
+            <if test="isModify !=null">
+                modify_time = now()
+            </if>
         </set>
         <where>
             <if test="null != projectId">

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java

@@ -353,6 +353,11 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             if (StringUtils.isBlank(modifyProjectVo.getOaProjectId())) {
                 throw new BaseCustomException("666", "请填写项目/商机编号");
             }
+            if (!StringUtils.isBlank(workProject.getOaProjectId())) {
+                if (modifyProjectVo.getOaProjectId().equals(workProject.getOaProjectId())) {
+                    throw new BaseCustomException(BASE_RESP_CODE_ENUM.theNewContent_IsEqual_ToTheOriginal_Content);
+                }
+            }
             WorkProjectChange workProjectChange = new WorkProjectChange();
             workProjectChange.setProjectId(modifyProjectVo.getProjectId());
             workProjectChange.setModifyTime(new Date());
@@ -368,6 +373,11 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             if (StringUtils.isBlank(modifyProjectVo.getProjectName())) {
                 throw new BaseCustomException("666", "请填写项目/商机名称");
             }
+            if (!StringUtils.isBlank(workProject.getProjectName())) {
+                if (modifyProjectVo.getProjectName().equals(workProject.getProjectName())) {
+                    throw new BaseCustomException(BASE_RESP_CODE_ENUM.theNewContent_IsEqual_ToTheOriginal_Content);
+                }
+            }
             WorkProjectChange workProjectChange = new WorkProjectChange();
             workProjectChange.setProjectId(modifyProjectVo.getProjectId());
             workProjectChange.setModifyTime(new Date());
@@ -393,6 +403,8 @@ public class WorkProjectServiceImpl implements WorkProjectService {
                 workProjectChange.setOperationType(2);
                 workProjectChange.setReviserId(modifyProjectVo.getReviserId());
                 workProjectChanges.add(workProjectChange);
+            }else{
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.theNewContent_IsEqual_ToTheOriginal_Content);
             }
         }
         if (!StringUtils.isBlank(modifyProjectVo.getManagerIdReason())) {
@@ -407,6 +419,8 @@ public class WorkProjectServiceImpl implements WorkProjectService {
                 workProjectChange.setOperationType(2);
                 workProjectChange.setReviserId(modifyProjectVo.getReviserId());
                 workProjectChanges.add(workProjectChange);
+            }else{
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.theNewContent_IsEqual_ToTheOriginal_Content);
             }
 
         }
@@ -469,7 +483,8 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             workProjectChanges.add(workProjectChange);
         }
         if (!StringUtils.isBlank(modifyProjectVo.getUserIdsReason())) {
-            if (!userIds.equals(modifyProjectVo.getUserIds())) {
+            if (!(userIds.containsAll(modifyProjectVo.getUserIds()) &&
+                    modifyProjectVo.getUserIds().containsAll(userIds))) {
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("status", 1);
                 List<WorkUser> byMap = workUserService.getByMap(map);
@@ -508,6 +523,8 @@ public class WorkProjectServiceImpl implements WorkProjectService {
                 workProjectChange.setOperationType(2);
                 workProjectChange.setReviserId(modifyProjectVo.getReviserId());
                 workProjectChanges.add(workProjectChange);
+            }else{
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.theNewContent_IsEqual_ToTheOriginal_Content);
             }
         }
 
@@ -588,7 +605,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
         workProjectChange.setOperationType(1);
         int insert1 = workProjectChangeMapper.insert(workProjectChange);
 
-        return insert1>0;
+        return insert1 > 0;
     }
 
     private OrderChangeDto getProjevtAndTypeOfDept(Integer userId, Boolean isFillIn, Boolean addProjectOfDept) {
@@ -685,11 +702,16 @@ public class WorkProjectServiceImpl implements WorkProjectService {
                     }
                 }
                 if (!isAdd) {
-                    DeptOfProjectAndOrderType projectAndOrderType = new DeptOfProjectAndOrderType();
-                    projectAndOrderType.setDeptId(user.getDeptId());
-                    projectAndOrderType.setDeptName(dept.getDeptName());
-                    projectAndOrderType.setProjectManagerDtos(projectManagerDtos);
-                    projectAndOrderTypes.add(projectAndOrderType);
+                    if (addProjectOfDept) {
+                        projectAndOrderTypes = workDeptService.getDeptOfProjectAndOrderType(null, projectOfDeptId);
+                        projectAndOrderTypes.get(0).getProjectManagerDtos().addAll(projectManagerDtos);
+                    } else {
+                        DeptOfProjectAndOrderType projectAndOrderType = new DeptOfProjectAndOrderType();
+                        projectAndOrderType.setDeptId(user.getDeptId());
+                        projectAndOrderType.setDeptName(dept.getDeptName());
+                        projectAndOrderType.setProjectManagerDtos(projectManagerDtos);
+                        projectAndOrderTypes.add(projectAndOrderType);
+                    }
                 }
                 // 组织架构
                 if (isFillIn) {
@@ -881,10 +903,9 @@ public class WorkProjectServiceImpl implements WorkProjectService {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.REASON_CANNOT_BE_EMPTY);
             }
         }
-
         //  是否存在变更项
-        if ((modifyCount ==1 && StringUtils.isBlank(modifyProjectVo.getUserIdsReason()))||
-                modifyCount>1) {
+        if ((modifyCount == 1 && StringUtils.isBlank(modifyProjectVo.getUserIdsReason())) ||
+                modifyCount > 1) {
             modifyProjectVo.setIsModify(1);
         }