考勤-批量请假流程,请假明细生成逻辑优化,修复时长累加问题

zm_dev
sy 11 months ago
parent 877476efc0
commit 0a74b875fb

@ -502,10 +502,10 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic
String sql = ""; String sql = "";
List<Map<String, Object>> bcDetailData; List<Map<String, Object>> bcDetailData;
String targetDateBcId = ""; String targetDateBcId = "";
int scMinutes = 0;
leaveDateList.add(0, DateUtil.beforeDay(startDate,1)); leaveDateList.add(0, DateUtil.beforeDay(startDate,1));
leaveDateList.add(DateUtil.AfterDay(endDate,1)); leaveDateList.add(DateUtil.AfterDay(endDate,1));
for (String leaveEmpId : leaveEmpIdList) { for (String leaveEmpId : leaveEmpIdList) {
int scMinutes = 0;
//需要自动移除日期区间内的休息日时,去除请假日期区间中的休息日 //需要自动移除日期区间内的休息日时,去除请假日期区间中的休息日
List<Map<String, Object>> scheduleInfoList = scheduleInfoMap.getOrDefault(leaveEmpId, new ArrayList<>()); 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")))); Map<String, String> dateToBcxxMap = scheduleInfoList.stream().collect(Collectors.toMap(e->Util.null2String(e.get("bcrq")),e->Util.null2String(e.get("bcxx"))));

Loading…
Cancel
Save