优化代码结构

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

@@ -81,9 +81,6 @@ public enum BASE_RESP_CODE_ENUM {
     CENTERMANAGERALREADYEXISTS("661","该中心已经有中心负责人"),
     ROLE_CANNOTBE_EMPTY("662", "设置的角色不能为空"),
     NOADMIN_ISTRATIVE_RIGHTS("663", "设置的负责人没有管理权限"),
-    NON_PROJECT_OPPORTUNITYNUMBERNAME_ISEMPTY("664", "非项目,无商机属性"),
-    THEPROJECT_HASBEEN_CLOSED("665", "该项目/商机已经结束，请重新选择填报"),
-    THISTYPEOF_WORKINGHOURS_HASENDE("666", "该工时类型已经结束，请选择其他类型"),
     CHOOSEATLEASTONEROLE("667", "至少保留一个角色"),
 
     ;

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

@@ -304,14 +304,15 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                     if (workTimeOrder.getType().equals(1) || workTimeOrder.getType().equals(2)) {
                         for (WorkProject projectsById : projectsByIds) {
                             if (projectsById.getId().equals(workTimeOrder.getProjectId())) {
-                                throw new BaseCustomException(BASE_RESP_CODE_ENUM.THEPROJECT_HASBEEN_CLOSED);
+
+                                throw new BaseCustomException("666", projectsById.getProjectName()+"已经结束，请重新选择填报");
                             }
                         }
                     }else{
                         for (WorkType workType : workTypes) {
                             if (workType.getStatus().equals(0)) {
                                 if (workType.getId().equals(workTimeOrder.getType())) {
-                                    throw new BaseCustomException(BASE_RESP_CODE_ENUM.THISTYPEOF_WORKINGHOURS_HASENDE);
+                                    throw new BaseCustomException("667",workType.getName()+"已经结束，请重新选择填报");
                                 }
                             }
                         }