|
@@ -6661,7 +6661,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
int days = WorkDayCalculateUtils.getWorkDaysListInRange(startDate, endDate, 0).size();
|
|
|
Float allday = allDay.getAllday();
|
|
|
float standardHours = allday*days;
|
|
|
- float leaveSum = leaveSheetService.leaveTimeSum(companyId,startDate,endDate,standardHours,allday,leaveSheet);
|
|
|
+ float leaveSum = leaveSheetService.leaveTimeSum(companyId,startDate,endDate,standardHours,allday,leaveSheets);
|
|
|
map.put("leaveSum",leaveSum + "h");
|
|
|
double workTimeDouble = Double.parseDouble(map.get("workingTime").toString()) + leaveSum;
|
|
|
BigDecimal workTimeBig = new BigDecimal(workTimeDouble);
|