优化代码结构

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

@@ -557,15 +557,17 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         WorkSubmitAdopt workSubmitAdopt = workSubmitAdoptService.getById(1);
         Integer submitTime = workSubmitAdopt.getSubmitTime();
 
-        // 判断是否重复填报
-        isRepeat(list);
 
         for (WorkTimeOrderDto dto : list) {
+            if (null == dto.getWorkTime() || 0 == dto.getWorkTime()) {
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.TIME_NOT_IS_NULL);
+            }
+
             if (null == dto.getDes()) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.DES_NOT_NULL);
             }
 
-            if (null == dto.getWorkDay()) {
+            if (null == dto.getWorkDay() || null == dto.getType()) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
             }
 
@@ -573,9 +575,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_TIME_OVER_NOW_DAY);
             }
 
-            if (0 == dto.getWorkTime() || null ==dto.getWorkTime()) {
-                throw new BaseCustomException(BASE_RESP_CODE_ENUM.TIME_NOT_IS_NULL);
-            }
             // 2、默认设置超过系统默认3天（包括驳回3天）未填报的工时将不能填报
             if (date.getTime() - dto.getWorkDay().getTime() > submitTime * 24 * 60 * 60 * 1000) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_DAY_THAN_DATE);
@@ -586,6 +585,10 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
             }
         }
+
+
+        // 判断是否重复填报
+        isRepeat(list);
         // 4.每天工时累加不得超过八小时
         timeNotEight(0, list);
 
@@ -686,8 +689,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             }
             dto.setProjectName(null != dto.getProjectId() ? workProjectService.getById(dto.getProjectId()).getProjectName() : getTypeName(dto.getType()));
             // 获取项目经理
-            if(null != dto.getProjectId())
-            dto.setProjectManagerName(workUserService.getById(workProjectService.getById(dto.getProjectId()).getManagerId()).getName());
+            if (null != dto.getProjectId())
+                dto.setProjectManagerName(workUserService.getById(workProjectService.getById(dto.getProjectId()).getManagerId()).getName());
             // 获取类型名
             dto.setTypeName(getTypeName(dto.getType()));
             // 获取部门id
@@ -758,7 +761,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         PageInfo<WorkTimeOrderDto> pageInfo = new PageInfo<>(workTimeOrderDtos);
 
 
-
         return pageInfo;
     }