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);