1.更新日工时统计

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

@@ -132,11 +132,9 @@ public class WorkHourStatistics {
                             BigDecimal personDays = (self.getHoursWorked().divide(chuanyunWorkHourDO.getHoursWorked(), 2, RoundingMode.HALF_UP)).multiply(standard);
                             chuanyunSelfWorkHourDO.setStandardWorkHour(personDays);
                         }
-                        List<ChuanyunSelfWorkHourDO> list = chuanyunSelfWorkHourDao.findByUserIdAndDayLogDate(chuanyunUserCompanyDO.getUserId(),self.getDayLogDate());
-                        if (list!=null && list.size()>0) {
-                            for (ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO1 : list){
-                                chuanyunSelfWorkHourDao.delete(chuanyunSelfWorkHourDO1);
-                            }
+                        ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO1 = chuanyunSelfWorkHourDao.findByUserIdAndAndProjectIdAndAndDayLogDateAndProjectType(chuanyunUserCompanyDO.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);
                     }

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

@@ -167,6 +167,7 @@ public class WorkHourStatisticsRecently {
      * 同步最近一个月每日工时
      */
     public void standardWorkHour() {
+        log.info("开始每日工时标准化");
         var flag = true;
         var pageSize = 20;
         var page = 0;
@@ -196,7 +197,7 @@ public class WorkHourStatisticsRecently {
      * @param chuanyunUserCompanyDO 员工信息
      */
     private void standardHour(ChuanyunUserCompanyDO chuanyunUserCompanyDO) {
-        log.info("开始每日工时标准化");
+
         BigDecimal standard = new BigDecimal(8);
         //每人每个项目每天工时
         List<ChuanyunWorkHourDO> selfList = chuanyunWorkHourDao.getSelfWorkHourRecently(chuanyunUserCompanyDO.getUserId());
@@ -223,11 +224,9 @@ public class WorkHourStatisticsRecently {
                         BigDecimal personDays = (self.getHoursWorked().divide(chuanyunWorkHourDO.getHoursWorked(), 2, RoundingMode.HALF_UP)).multiply(standard);
                         chuanyunSelfWorkHourDO.setStandardWorkHour(personDays);
                     }
-                    List<ChuanyunSelfWorkHourDO> list = chuanyunSelfWorkHourDao.findByUserIdAndDayLogDate(chuanyunUserCompanyDO.getUserId(),self.getDayLogDate());
-                    if (list!=null && list.size()>0) {
-                        for (ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO1 : list){
-                            chuanyunSelfWorkHourDao.delete(chuanyunSelfWorkHourDO1);
-                        }
+                    ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO1 = chuanyunSelfWorkHourDao.findByUserIdAndAndProjectIdAndAndDayLogDateAndProjectType(chuanyunUserCompanyDO.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);
                 }