优化代码结构

wisenergy-mapper/src/main/resources/mapper/WorkCollectMapper.xml

@@ -20,10 +20,10 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, work_day, total_time, status,reject_time, create_time, modify_time,
+        id, user_id, work_day, total_time, status,reject_time,create_time,modify_time
     </sql>
     <sql id="cols_exclude_id">
-        user_id, work_day, total_time, status,reject_time, create_time, modify_time
+        user_id, work_day, total_time, status,reject_time,create_time,modify_time
     </sql>
 
     <sql id="table">

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

@@ -104,10 +104,9 @@ public class WorkCollectServiceImpl implements WorkCollectService {
         int modifyTime = 1;
         Date date = new Date();
         WorkSubmitAdopt submitAdopt = workSubmitAdoptService.getById(1);
-        if (3 == workCollect.getStatus()) {
+        if (null != workCollect.getRejectTime()) {
             Date rejectTime = workCollect.getRejectTime();
             rejectTime = DateUtil.convertStrToDate(DateUtil.convertDateToStr(rejectTime, "yyyy-MM-dd"), "yyyy-MM-dd");
-            System.out.println(modifyTime);
             if (date.getTime() - rejectTime.getTime() > submitAdopt.getSubmitTime() * 24 * 60 * 60 * 1000) {
                 modifyTime = 0;
             }

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

@@ -61,7 +61,7 @@ public class Trigger implements SchedulingConfigurer {
                 , triggerContext -> {
 
             Integer autoAdopt = workSubmitAdoptService.getById(1).getAutoAdopt();
-            String time = "0 30 17 */" + autoAdopt + " * ?";
+            String time = "0 0 0 */" + autoAdopt + " * ?";
             //返回执行的周期
             return new CronTrigger(time).nextExecutionTime(triggerContext);
         });