Quellcode durchsuchen

外勤考勤统计修改

xiao547607 vor 4 Jahren
Ursprung
Commit
2516f2b36f

+ 2 - 4
web/src/main/java/com/jpsoft/shinestar/modules/business/controller/WorkScheduleAttendanceController.java

@@ -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);
 
                 //休息天数
                 //查询的总天数-实际出勤天数