From 6f5b15a508bb620ea525e70b7160147d33a5d254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Thu, 7 Aug 2025 10:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=80=83=E5=8B=A4vs=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E5=B7=A5=E6=97=B6=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0BU=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xujie/sys/modules/pms/data/AttendanceData.java | 1 + .../sys/modules/pms/service/Impl/EamServiceImpl.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/data/AttendanceData.java b/src/main/java/com/xujie/sys/modules/pms/data/AttendanceData.java index a2bacc1d..95d8dc9e 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/AttendanceData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/AttendanceData.java @@ -11,6 +11,7 @@ import java.util.Date; public class AttendanceData { private String site; private String buNo; + private String bu; private String deptId; private String deptName; private String operatorId; diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index 6612218c..c0468f4b 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -3972,7 +3972,12 @@ public class EamServiceImpl implements EamService { */ @Override public List exportEmployeeAttendanceSearch(AttendanceData data) { - String site = data.getSite(); + String site =""; + String buNo =""; + if (!Objects.isNull(data.getBu())){ + site =data.getBu().split("_")[0]; + buNo = data.getBu().split("_")[1]; + } String operatorId = data.getOperatorId(); String deptId = data.getDeptId(); String startDate = data.getStartDate() == null ? "" : DateUtil.getStringDate(data.getStartDate()); @@ -3987,6 +3992,7 @@ public class EamServiceImpl implements EamService { } List params = new ArrayList<>(); params.add(site); + params.add(buNo); params.add(operatorId); params.add(deptId); params.add(startDate);