Browse Source

1.修改每日工时统计

WoNiu 4 năm trước cách đây
mục cha
commit
1124fb6bcf

+ 1 - 1
src/main/java/com/galaxis/manatee/task/WorkHourStatistics.java

@@ -110,7 +110,7 @@ public class WorkHourStatistics {
                 ChuanyunWorkHourDO chuanyunWorkHourDO = chuanyunWorkHourDao.getDayWorkHour(chuanyunUserCompanyDO.getUserId(),self.getDayLogDate());
                 //工时标准化
                 if (chuanyunWorkHourDO != null) {
-                    if (chuanyunWorkHourDO.getHoursWorked().compareTo(standard)<0) {
+                    if (chuanyunWorkHourDO.getHoursWorked().compareTo(standard)<=0) {
                         chuanyunSelfWorkHourDO.setStandardWorkHour(self.getHoursWorked());
                     }else {
                         BigDecimal personDays = (self.getHoursWorked().divide(chuanyunWorkHourDO.getHoursWorked(), 2, RoundingMode.HALF_UP)).multiply(standard);