优化代码结构

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

@@ -258,9 +258,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
 
         for (WorkTimeOrder dto : addList) {
-
-                Date rejectTime1 = workCollectService.getByUserIdAndWorkDay(dto.getUserId(), dto.getWorkDay()).getRejectTime();
-            if (null != rejectTime1) {
+            WorkCollect byUserIdAndWorkDay = workCollectService.getByUserIdAndWorkDay(dto.getUserId(), dto.getWorkDay());
+            if (null !=byUserIdAndWorkDay &&  null != byUserIdAndWorkDay.getRejectTime()) {
+                Date rejectTime1 = byUserIdAndWorkDay.getRejectTime();
                 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) {
@@ -288,6 +288,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         // 更新collect表
         int status = statusYes(workTimeOrders.get(0).getUserId(), workTimeOrders.get(0).getWorkDay());
         WorkCollect workCollect = workCollectService.getByUserIdAndWorkDay(workTimeOrders.get(0).getUserId(), workTimeOrders.get(0).getWorkDay());
+
         if (null == workCollect) {
             workCollect = new WorkCollect();
             BeanUtils.copyProperties(workTimeOrders.get(0), workCollect);

wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/auto/Trigger.java

@@ -16,6 +16,7 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.scheduling.config.TriggerTask;
 import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,12 +53,15 @@ public class Trigger implements SchedulingConfigurer {
                     }
                     //  更新work_time_order表
                     List<WorkTimeOrder> workTimeOrders = workTimeOrderMapper.getAutoOrder(autoExamine*24);
+                    if (!CollectionUtils.isEmpty(workTimeOrders)) {
                         List<Integer> projectIds = new ArrayList<>();
                         workTimeOrders.forEach(wto -> projectIds.add(wto.getWorkId()));
                         workTimeOrderMapper.updateAutoExamine(projectIds);
                         // 更新work_collect表
                         workCollectService.updateByWorkTimeOrder(workTimeOrders);
                     }
+
+                }
                 , triggerContext -> {
 
             Integer autoAdopt = workSubmitAdoptService.getById(1).getAutoAdopt();