1.修改工时标准化

src/main/java/com/galaxis/manatee/dao/ChuanyunWorkHourDao.java

@@ -30,7 +30,8 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "chuanyun_day_log.day_log_date " +
             "FROM chuanyun_day_log "+
             "LEFT JOIN chuanyun_log ON chuanyun_day_log.parent_object_id = chuanyun_log.object_id " +
-            " WHERE chuanyun_log.user_id = ? " +
+            " WHERE chuanyun_log.user_id = ?" +
+            "and status!=3" +
 //            "AND chuanyun_log.log_date>='2020-08-12'" +
             " GROUP BY chuanyun_day_log.project_id," +
             "chuanyun_log.user_id," +
@@ -77,6 +78,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "LEFT JOIN chuanyun_log ON chuanyun_day_log.parent_object_id = chuanyun_log.object_id " +
             " WHERE chuanyun_log.user_id = ? " +
             "AND DATE_SUB(CURDATE(), INTERVAL 1 MONTH) <= date(chuanyun_day_log.day_log_date)" +
+            "AND status!=3" +
             " GROUP BY chuanyun_day_log.project_id," +
             "chuanyun_log.user_id," +
             "chuanyun_day_log.project_type," +
@@ -102,6 +104,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "LEFT JOIN chuanyun_log ON chuanyun_day_log.parent_object_id = chuanyun_log.object_id " +
             "WHERE chuanyun_log.user_id = ? " +
             "AND chuanyun_day_log.day_log_date =? " +
+            "AND status!=3 " +
             "GROUP BY chuanyun_log.user_id," +
             "chuanyun_day_log.day_log_date",
             nativeQuery = true)

src/main/java/com/galaxis/manatee/task/ChuanyunHumanResourceScheduledTask.java

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

src/main/java/com/galaxis/manatee/task/WorkHourStatisticsRecently.java

@@ -55,7 +55,7 @@ public class WorkHourStatisticsRecently {
 
     @Scheduled(fixedDelay = 3600000L)
     public void updateHour() {
-        dayLog();
+//        dayLog();
         standardWorkHour();
         standardWeeklyWorkHour();
         standardMonthlyWorkHour();
@@ -71,7 +71,7 @@ public class WorkHourStatisticsRecently {
         var flag = true;
         List<String> matchersString=new ArrayList<>();
         //由于需要统计流程中的日志，在日志数据同步时将状态为2的数据一并统计
-        matchersString.add("Status_6,[1;2]");
+        matchersString.add("Status_6,[1;2;3]");
         //获取当前时间30天前日期
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime now = LocalDateTime.now();