|
|
@ -472,10 +472,10 @@ public class BusinessTripsApplyServiceImpl extends Service implements BusinessTr
|
|
|
|
String sql = "";
|
|
|
|
String sql = "";
|
|
|
|
List<Map<String, Object>> bcDetailData;
|
|
|
|
List<Map<String, Object>> bcDetailData;
|
|
|
|
String targetDateBcId = "";
|
|
|
|
String targetDateBcId = "";
|
|
|
|
int scMinutes = 0;
|
|
|
|
|
|
|
|
dateList.add(0, DateUtil.beforeDay(startDate,1));
|
|
|
|
dateList.add(0, DateUtil.beforeDay(startDate,1));
|
|
|
|
dateList.add(DateUtil.AfterDay(endDate,1));
|
|
|
|
dateList.add(DateUtil.AfterDay(endDate,1));
|
|
|
|
for (String ccEmpId : empIdList) {
|
|
|
|
for (String ccEmpId : empIdList) {
|
|
|
|
|
|
|
|
int scMinutes = 0;
|
|
|
|
//需要自动移除日期区间内的休息日时,去除出差日期区间中的休息日
|
|
|
|
//需要自动移除日期区间内的休息日时,去除出差日期区间中的休息日
|
|
|
|
List<Map<String, Object>> scheduleInfoList = scheduleInfoMap.getOrDefault(ccEmpId, new ArrayList<>());
|
|
|
|
List<Map<String, Object>> scheduleInfoList = scheduleInfoMap.getOrDefault(ccEmpId, 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"))));
|
|
|
|