|
@@ -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);
|