|
@@ -603,10 +603,8 @@ public class WorkScheduleAttendanceController {
|
|
|
// wsaDTO.setLeaveNum(BigDecimal.ZERO);
|
|
|
// }
|
|
|
//请假天数leaveNum
|
|
|
- Map<String,Object> searchParams12 = new HashMap<>();
|
|
|
- searchParams12.put("workStatus","4");
|
|
|
- int leaveNum = workScheduleAttendanceService.findCountByParams(pi.getId(),startDate,endDate,searchParams12);
|
|
|
- wsaDTO.setLeaveNum(new BigDecimal(leaveNum));
|
|
|
+ BigDecimal leaveNum = requestForLeaveInfoService.sumDaysByPersonIdAndTimeRange(pi.getId(),startDate,endDate);
|
|
|
+ wsaDTO.setLeaveNum(leaveNum);
|
|
|
|
|
|
//休息天数
|
|
|
//查询的总天数-实际出勤天数
|