Jelajahi Sumber

删除了历史工时时间判断。

verguenza 4 tahun lalu
induk
melakukan
1b9b3795f2

+ 1 - 1
src/main/java/com/galaxis/manatee/dao/ChuanyunWorkHourDao.java

@@ -30,7 +30,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "FROM chuanyun_day_log "+
             "LEFT JOIN chuanyun_log ON chuanyun_day_log.parent_object_id = chuanyun_log.object_id " +
             " WHERE chuanyun_log.user_id = ? " +
-            "AND chuanyun_log.log_date>='2020-08-01'" +
+//            "AND chuanyun_log.log_date>='2020-08-01'" +
             " GROUP BY chuanyun_day_log.project_id," +
             "chuanyun_log.user_id," +
             "chuanyun_log.status," +

+ 2 - 2
src/main/java/com/galaxis/manatee/task/ChuanyunHumanResourceScheduledTask.java

@@ -70,7 +70,7 @@ public class ChuanyunHumanResourceScheduledTask {
         //由于需要统计流程中的日志,在日志数据同步时将状态为2的数据一并统计
 //        matchersString.add("Status_2,1");
         matchersString.add("Status_6,[1;2]");
-        matchersString.add("logDate_4,2020-08-01 00:00:00");
+//        matchersString.add("logDate_4,2020-08-01 00:00:00");
         while (flag) {
             Long startTime= Instant.now().getEpochSecond();
             try {
@@ -251,7 +251,7 @@ public class ChuanyunHumanResourceScheduledTask {
         List<String> matchersString=new ArrayList<>();
         //由于需要统计流程中的日志,在日志数据同步时将状态为2的数据一并统计
         matchersString.add("Status_6,[1;2]");
-        matchersString.add("logDate_1,2020-08-01 00:00:00");
+//        matchersString.add("logDate_1,2020-08-01 00:00:00");
         while (flag) {
             Long startTime= Instant.now().getEpochSecond();
             try {

+ 2 - 1
src/main/java/com/galaxis/manatee/task/WorkHourAnalysis.java

@@ -3,6 +3,7 @@ package com.galaxis.manatee.task;
 import com.galaxis.manatee.dao.ChuanyunDayWorkAbcDao;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunDayWorkAbcDO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -26,7 +27,7 @@ public class WorkHourAnalysis {
         this.chuanyunDayWorkAbcDao = chuanyunDayWorkAbcDao;
     }
 
-    //    @Scheduled(fixedDelay = 3600000L)
+    @Scheduled(fixedDelay = 3600000L)
     private void standardDayWorkAbcHour() {
         standardDayAbcHour();
     }