diff --git a/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java b/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java index 95ba9fe..0d06d76 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java +++ b/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java @@ -502,10 +502,10 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic String sql = ""; List> bcDetailData; String targetDateBcId = ""; - int scMinutes = 0; leaveDateList.add(0, DateUtil.beforeDay(startDate,1)); leaveDateList.add(DateUtil.AfterDay(endDate,1)); for (String leaveEmpId : leaveEmpIdList) { + int scMinutes = 0; //需要自动移除日期区间内的休息日时,去除请假日期区间中的休息日 List> scheduleInfoList = scheduleInfoMap.getOrDefault(leaveEmpId, new ArrayList<>()); Map dateToBcxxMap = scheduleInfoList.stream().collect(Collectors.toMap(e->Util.null2String(e.get("bcrq")),e->Util.null2String(e.get("bcxx"))));