1.修改月工时

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

@@ -62,7 +62,7 @@ public class WorkHourStatistics {
     }
 
 
-    @Scheduled(fixedDelay = 3600000L)
+    @Scheduled(fixedDelay = 432000000L)
     public void updateHour() {
 //        standardWorkHour();
 //        standardWeeklyWorkHour();
@@ -194,18 +194,20 @@ public class WorkHourStatistics {
         var flag = true;
         var pageSize = 20;
         var page = 0;
-//        while(flag) {
-//            var pageable= PageRequest.of(page,pageSize);
-//            var chuanyunUserCompanyList = chuanyunUserCompanyDao.findAllByStatus(1,pageable);
-//            if (page<=chuanyunUserCompanyList.getTotalPages()){
-//                page += 1;
-//                List<ChuanyunUserCompanyDO> userCompanyDOList = chuanyunUserCompanyList.getContent();
-//                //单项目单人单月成本
-//                userCompanyDOList.forEach(this::standardMonthlyHour);
-//            }else {
-//                flag = false;
-//            }
-//        }
+        log.info("开始月工时标准化");
+        while(flag) {
+            var pageable= PageRequest.of(page,pageSize);
+            var chuanyunUserCompanyList = chuanyunUserCompanyDao.findAllByStatus(1,pageable);
+            if (page<=chuanyunUserCompanyList.getTotalPages()){
+                page += 1;
+                List<ChuanyunUserCompanyDO> userCompanyDOList = chuanyunUserCompanyList.getContent();
+                //单项目单人单月成本
+                userCompanyDOList.forEach(this::standardMonthlyHour);
+            }else {
+                flag = false;
+            }
+        }
+
         updateChuanyunMonthHour();
     }
 
@@ -214,6 +216,7 @@ public class WorkHourStatistics {
      * @param chuanyunUserCompanyDO 员工信息
      */
     private void standardMonthlyHour(ChuanyunUserCompanyDO chuanyunUserCompanyDO) {
+        log.info(chuanyunUserCompanyDO.getUserName()+"月工时更新");
         //删除上一次状态为审核中，但本次已经审核通过的数据
         chuanyunSelfCostDao.findAllByStatusAndUserId(ChuanYunConstant.IN_PROCESS,chuanyunUserCompanyDO.getUserId()).forEach(chuanyunSelfCostDO -> {
             List<ChuanyunSelfWorkHourDO> chuanyunSelfWorkHourList=chuanyunSelfWorkHourDao.findAllByUserIdAndProjectIdAndProjectTypeAndStatusAndDayLogDateBetween(
@@ -453,7 +456,7 @@ public class WorkHourStatistics {
                                 chuanyunSaveDTO =chuanYunManager.save(ChuanyunMemberMonthCostDO.SCHEMA_CODE,memberMonthString,true);
                             }
                             if(!chuanyunSaveDTO.getSuccessful()){
-                                log.warn("新增项目成员月度成本汇总失败");
+                                log.warn("新增项目成员月度工时汇总失败");
                             }
                         } catch (Exception e) {
                             e.printStackTrace();