diff --git a/src/com/engine/jucailinkq/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java b/src/com/engine/jucailinkq/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java index 448d589..d83af1c 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java +++ b/src/com/engine/jucailinkq/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java @@ -472,10 +472,10 @@ public class BusinessTripsApplyServiceImpl extends Service implements BusinessTr String sql = ""; List> bcDetailData; String targetDateBcId = ""; - int scMinutes = 0; dateList.add(0, DateUtil.beforeDay(startDate,1)); dateList.add(DateUtil.AfterDay(endDate,1)); for (String ccEmpId : empIdList) { + int scMinutes = 0; //需要自动移除日期区间内的休息日时,去除出差日期区间中的休息日 List> scheduleInfoList = scheduleInfoMap.getOrDefault(ccEmpId, new ArrayList<>()); Map dateToBcxxMap = scheduleInfoList.stream().collect(Collectors.toMap(e->Util.null2String(e.get("bcrq")),e->Util.null2String(e.get("bcxx"))));