优化代码结构

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

@@ -256,20 +256,24 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             addList.add(workTimeOrder);
         }
 
+
         for (WorkTimeOrder dto : addList) {
+
+                Date rejectTime1 = workCollectService.getByUserIdAndWorkDay(dto.getUserId(), dto.getWorkDay()).getRejectTime();
+            if (null != rejectTime1) {
+                dto.setStatus(RE_SUBMIT);
+                Date rejectTime = DateUtil.convertStrToDate(DateUtil.convertDateToStr(rejectTime1, "yyyy-MM-dd"), "yyyy-MM-dd");
+                if (date.getTime() - rejectTime.getTime() > submitTime * 24 * 60 * 60 * 1000) {
+                    throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_DAY_THAN_DATE);
+                }
+            }
             // 4、默认设置超过系统默认3天（包括驳回3天）未填报的工时将不能填报
             if (!REJECTED.equals(dto.getStatus()) && !RE_SUBMIT.equals(dto.getStatus())) {
                 if (date.getTime() - dto.getWorkDay().getTime() > submitTime * 24 * 60 * 60 * 1000) {
                     throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_DAY_THAN_DATE);
                 }
             }
-            if (REJECTED.equals(dto.getStatus()) || RE_SUBMIT.equals(dto.getStatus())) {
-                Date rejectTime = DateUtil.convertStrToDate(DateUtil.convertDateToStr(workTimeOrderMapper.selectById(dto.getWorkId()).getRejectTime(), "yyyy-MM-dd"), "yyyy-MM-dd");
 
-                if (date.getTime() - rejectTime.getTime() > submitTime * 24 * 60 * 60 * 1000) {
-                    throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_DAY_THAN_DATE);
-                }
-            }
         }
 
         // 删除数据库还没有审批的工单，添加填报没有审批的工单