1.修改子项目每日工时

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

@@ -48,7 +48,7 @@ public class SubWorkHourStatistics {
     @Scheduled(fixedDelay = 86400000L)
     public void updateHour(){
         standardWorkHour();
-        updateAllChuanyunSelfSubWorkHour();
+//        updateAllChuanyunSelfSubWorkHour();
     }
 
 
@@ -56,10 +56,12 @@ public class SubWorkHourStatistics {
      * 子项目每日工时标准化
      */
     private void standardWorkHour(){
+        log.info("开始子项目每日工时标准化");
         chuanyunUserCompanyDao.findAll().forEach(chuanyunUserCompanyDO -> {
-            List<ChuanyunSubWorkHourDO> list = chuanyunSubProjectDao.getSubSelfWorkHour(chuanyunUserCompanyDO.getUserId());
+            List<ChuanyunSubWorkHourDO> list = chuanyunSubProjectDao.getSubSelfWorkHour("f5522d96-3404-444d-a239-f9e03d70f1c2");
             if (list!=null&&list.size()>0){
                 list.forEach(chuanyunSubWorkHourDO -> {
+                    log.info("gongshi:"+chuanyunSubWorkHourDO);
                     ChuanyunSelfSubWorkHourDO chuanyunSelfSubWorkHourDO = new ChuanyunSelfSubWorkHourDO();
                     chuanyunSelfSubWorkHourDO.setBg(chuanyunSubWorkHourDO.getBg());
                     chuanyunSelfSubWorkHourDO.setUserId(chuanyunSubWorkHourDO.getUserId());
@@ -80,14 +82,14 @@ public class SubWorkHourStatistics {
                             chuanyunSelfSubWorkHourDO.setStandardWorkHour(personDays);
                         }
                         //获取原始工时数据
-                        ChuanyunSelfSubWorkHourDO oldSelfSubWorkHourDO = new ChuanyunSelfSubWorkHourDO();
+                        List<ChuanyunSelfSubWorkHourDO> oldSelfSubWorkHourDO = new ArrayList<>();
                         if (chuanyunSubWorkHourDO.getStatus().equals("3")){
                             oldSelfSubWorkHourDO = chuanyunSelfSubWorkHourDao.findByUserIdAndProjectIdAndProjectTypeAndDayLogDateAndStatus(chuanyunSubWorkHourDO.getUserId(),chuanyunSubWorkHourDO.getProjectId(),chuanyunSubWorkHourDO.getProjectType(),chuanyunSubWorkHourDO.getDayLogDate(),chuanyunSubWorkHourDO.getStatus());
                         }else {
                             oldSelfSubWorkHourDO = chuanyunSelfSubWorkHourDao.findByUserIdAndProjectIdAndProjectTypeAndDayLogDate(chuanyunSubWorkHourDO.getUserId(),chuanyunSubWorkHourDO.getProjectId(),chuanyunSubWorkHourDO.getProjectType(),chuanyunSubWorkHourDO.getDayLogDate());
                         }
                         if (oldSelfSubWorkHourDO!=null){
-                            chuanyunSelfSubWorkHourDao.delete(oldSelfSubWorkHourDO);
+                            chuanyunSelfSubWorkHourDao.deleteInBatch(oldSelfSubWorkHourDO);
                         }
                         //新增每日工时
                         chuanyunSelfSubWorkHourDao.save(chuanyunSelfSubWorkHourDO);
@@ -119,7 +121,7 @@ public class SubWorkHourStatistics {
                         if (chuanyunSelfWorkHourDTO.getStatus().equals("3")){
                             matchers.add("F0000006_2," + chuanyunSelfWorkHourDTO.getStatus());
                         }
-                        var filter = Filter.instance(0, 1, true, "And", matchers);
+                        var filter = Filter.instance(0, Integer.MAX_VALUE, true, "And", matchers);
                         var chuanyunFindAllResponse = chuanYunManager.findAll("D001789So1gvnogdib8ytl0owunkocnl6", filter);
                         var selfMonthString = objectMapper.writeValueAsString(chuanyunSelfWorkHourDTO);
                         ChuanyunSaveDTO chuanyunSaveDTO;