From 59d2142327acc40a02beb5bd864e11bac6c046ae Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 13 Aug 2024 18:04:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4-=E5=87=BA=E5=B7=AE=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=87=BA=E5=B7=AE=E6=98=8E=E7=BB=86=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=97=B6=E9=95=BF=E7=B4=AF=E5=8A=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/service/impl/BusinessTripsApplyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"))));