1.离职人员工时标准化

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

@@ -63,6 +63,7 @@ public class WorkHourStatistics {
         standardWorkHour();
         standardWeeklyWorkHour();
         standardMonthlyWorkHour();
+        quitStandradHour();
     }
 
     /**
@@ -452,6 +453,44 @@ public class WorkHourStatistics {
     }
 
     /**
+     * 离职人员工时标准化
+     */
+    private void quitStandradHour() {
+        List<ChuanyunWorkHourDO> selfList = chuanyunWorkHourDao.getQuitSelfWorkHour();
+        selfList.forEach(self -> {
+            BigDecimal standard = new BigDecimal(8);
+            if (self!=null){
+                ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO = new ChuanyunSelfWorkHourDO();
+                chuanyunSelfWorkHourDO.setStatus(self.getStatus());
+                chuanyunSelfWorkHourDO.setUserId(self.getUserId());
+                chuanyunSelfWorkHourDO.setProjectType(self.getProjectType());
+                if(ChuanYunConstant.PRODUCTION_PROJECT.equals(self.getProjectType())){
+                    chuanyunSelfWorkHourDO.setProjectId(ChuanYunConstant.PRODUCTION_PROJECT_ID);
+                }else{
+                    chuanyunSelfWorkHourDO.setProjectId(self.getProjectId());
+                }
+                chuanyunSelfWorkHourDO.setDayLogDate(self.getDayLogDate());
+                ChuanyunWorkHourDO chuanyunWorkHourDO = chuanyunWorkHourDao.getQuitDayWorkHour(self.getUserId(),self.getDayLogDate());
+                if (chuanyunWorkHourDO!=null){
+                    if (chuanyunWorkHourDO.getHoursWorked().compareTo(standard)<=0) {
+                        chuanyunSelfWorkHourDO.setStandardWorkHour(self.getHoursWorked());
+                    }else {
+                        BigDecimal personDays = (self.getHoursWorked().divide(chuanyunWorkHourDO.getHoursWorked(), 2, RoundingMode.HALF_UP)).multiply(standard);
+                        chuanyunSelfWorkHourDO.setStandardWorkHour(personDays);
+                    }
+                    ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO1 = chuanyunSelfWorkHourDao.findByUserIdAndAndProjectIdAndAndDayLogDateAndProjectType(self.getUserId(),ChuanYunConstant.PRODUCTION_PROJECT.equals(self.getProjectType())?ChuanYunConstant.PRODUCTION_PROJECT_ID:self.getProjectId(),self.getDayLogDate(),self.getProjectType());
+                    if (chuanyunSelfWorkHourDO1!=null){
+                        chuanyunSelfWorkHourDao.delete(chuanyunSelfWorkHourDO1);
+                    }
+                    chuanyunSelfWorkHourDao.save(chuanyunSelfWorkHourDO);
+//                    log.info(chuanyunSelfWorkHourDO.getUserId()+"工时标准化");
+                }
+            }
+        });
+        log.info("离职人员工时标准化完成"+selfList.size());
+    }
+
+    /**
      * 删除状态为审核中数据
      * @param schemaCode
      * @param

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

@@ -59,7 +59,6 @@ public class WorkHourStatisticsRecently {
         standardWorkHour();
         standardWeeklyWorkHour();
         standardMonthlyWorkHour();
-        quitStandradHour();
     }
 
     /**
@@ -266,43 +265,6 @@ public class WorkHourStatisticsRecently {
         log.info("日工时更新花费"+(Instant.now().getEpochSecond()-startTime));
     }
 
-    /**
-     * 离职人员工时标准化
-     */
-    private void quitStandradHour() {
-        List<ChuanyunWorkHourDO> selfList = chuanyunWorkHourDao.getQuitSelfWorkHour();
-        selfList.forEach(self -> {
-            BigDecimal standard = new BigDecimal(8);
-            if (self!=null){
-                ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO = new ChuanyunSelfWorkHourDO();
-                chuanyunSelfWorkHourDO.setStatus(self.getStatus());
-                chuanyunSelfWorkHourDO.setUserId(self.getUserId());
-                chuanyunSelfWorkHourDO.setProjectType(self.getProjectType());
-                if(ChuanYunConstant.PRODUCTION_PROJECT.equals(self.getProjectType())){
-                    chuanyunSelfWorkHourDO.setProjectId(ChuanYunConstant.PRODUCTION_PROJECT_ID);
-                }else{
-                    chuanyunSelfWorkHourDO.setProjectId(self.getProjectId());
-                }
-                chuanyunSelfWorkHourDO.setDayLogDate(self.getDayLogDate());
-                ChuanyunWorkHourDO chuanyunWorkHourDO = chuanyunWorkHourDao.getQuitDayWorkHour(self.getUserId(),self.getDayLogDate());
-                if (chuanyunWorkHourDO!=null){
-                    if (chuanyunWorkHourDO.getHoursWorked().compareTo(standard)<=0) {
-                        chuanyunSelfWorkHourDO.setStandardWorkHour(self.getHoursWorked());
-                    }else {
-                        BigDecimal personDays = (self.getHoursWorked().divide(chuanyunWorkHourDO.getHoursWorked(), 2, RoundingMode.HALF_UP)).multiply(standard);
-                        chuanyunSelfWorkHourDO.setStandardWorkHour(personDays);
-                    }
-                    ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO1 = chuanyunSelfWorkHourDao.findByUserIdAndAndProjectIdAndAndDayLogDateAndProjectType(self.getUserId(),ChuanYunConstant.PRODUCTION_PROJECT.equals(self.getProjectType())?ChuanYunConstant.PRODUCTION_PROJECT_ID:self.getProjectId(),self.getDayLogDate(),self.getProjectType());
-                    if (chuanyunSelfWorkHourDO1!=null){
-                        chuanyunSelfWorkHourDao.delete(chuanyunSelfWorkHourDO1);
-                    }
-                    chuanyunSelfWorkHourDao.save(chuanyunSelfWorkHourDO);
-//                    log.info(chuanyunSelfWorkHourDO.getUserId()+"工时标准化");
-                }
-            }
-        });
-        log.info("离职人员工时标准化完成"+selfList.size());
-    }
 
     /**
      * 人员-项目-周度工时汇总