优化代码结构

wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java

@@ -55,7 +55,7 @@ public enum BASE_RESP_CODE_ENUM {
     DEPT_NOT_FOUND("633", "部门信息未找到"),
     DATE_IS_ERROR("634","时间不匹配"),
     CENTRE_NOT_FOUND("635","中心信息未找到"),
-    TIME_NOT_IS_NULL("636","工时不能为0"),
+    TIME_NOT_IS_NULL("636","请选择今日工时"),
     WORKDAY_NOT_NULL("637","工时日期不能为空"),
     PROJECT_NOT_NULL("638","项目类型不能为空"),
     NEW_PASSWORD_IS_HTE_SAME_OLD_PASSWORD("639","新密码不能与旧密码相同"),

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

@@ -315,12 +315,21 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         int size = list.size();
         for (int i = 0; i < size; i++) {
             for (int j = i + 1; j < size; j++) {
-                if (list.get(i).getType().equals(list.get(j).getType())) {
+                if (PROJECT.equals(list.get(i).getType()) || BUSINESS_OPPORTUNITY.equals(list.get(i).getType())) {
+                    if (null == list.get(i).getProjectId() || null == list.get(j).getProjectId()) {
+                        throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_JOIN_EVERY_PROJECT_PLASE_JION);
+                    }else if(list.get(i).getProjectId().equals(list.get(j).getProjectId())){
+                        throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
+                    }
+                } else if (list.get(i).getType().equals(list.get(j).getProjectId())) {
+                    throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
+                }
+               /* if (list.get(i).getType().equals(list.get(j).getType())) {
                     if (null != list.get(i).getProjectId() && null != list.get(j).getProjectId() && !list.get(i).getProjectId().equals(list.get(j).getProjectId())) {
                         continue;
                     }
                     throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
-                }
+                }*/
             }
         }
     }
@@ -671,7 +680,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (1 == dto.getType() || 2 == dto.getType()) {
             if (null == dto.getProjectId())
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_JOIN_EVERY_PROJECT_PLASE_JION);
-
         }
         for (ProjectTypeEnum value : ProjectTypeEnum.values()) {
             if (value.getReviewer() == 2) {