|
|
|
@ -502,10 +502,10 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic
|
|
|
|
|
String sql = "";
|
|
|
|
|
List<Map<String, Object>> 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<Map<String, Object>> scheduleInfoList = scheduleInfoMap.getOrDefault(leaveEmpId, new ArrayList<>());
|
|
|
|
|
Map<String, String> dateToBcxxMap = scheduleInfoList.stream().collect(Collectors.toMap(e->Util.null2String(e.get("bcrq")),e->Util.null2String(e.get("bcxx"))));
|
|
|
|
|