From 281023a2a17cfe4bcc05d5d64019f87f7d206a85 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 26 May 2026 16:39:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms/attendance):=20=E4=B8=BA=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E=E5=91=98=E5=B7=A5?= =?UTF-8?q?ID=E9=9B=86=E5=90=88=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在AttendanceCheckBo中新增userIds字段，用于接收员工ID集合查询条件。同步更新WmsAttendanceScheduleBo、Mapper接口及XML映射，在查询排班时支持按userIds进行筛选。Service层将考勤查询条件中的userIds传递至排班查询逻辑，实现考勤数据按指定员工范围过滤。 --- .../src/main/java/com/klp/domain/bo/AttendanceCheckBo.java | 6 ++++++ .../java/com/klp/domain/bo/WmsAttendanceScheduleBo.java | 5 +++++ .../java/com/klp/mapper/WmsAttendanceScheduleMapper.java | 3 ++- .../com/klp/service/impl/WmsAttendanceCheckServiceImpl.java | 1 + .../klp/service/impl/WmsAttendanceScheduleServiceImpl.java | 4 ++-- .../resources/mapper/klp/WmsAttendanceScheduleMapper.xml | 6 ++++++ 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/domain/bo/AttendanceCheckBo.java b/klp-wms/src/main/java/com/klp/domain/bo/AttendanceCheckBo.java index 7837ce1d..cb2c6206 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/AttendanceCheckBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/AttendanceCheckBo.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.util.Date; +import java.util.List; @Data public class AttendanceCheckBo { @@ -16,4 +17,9 @@ public class AttendanceCheckBo { @NotNull(message = "结束日期不能为空") @JsonFormat(pattern = "yyyy-MM-dd") private Date endDate; + + /** + * 员工ID集合（为空则查全部） + */ + private List userIds; } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceScheduleBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceScheduleBo.java index 19329b95..84d6c7c6 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceScheduleBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceScheduleBo.java @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.*; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -71,4 +72,8 @@ public class WmsAttendanceScheduleBo extends BaseEntity { @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endDate; + /** + * 员工ID集合 + */ + private List userIds; } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsAttendanceScheduleMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsAttendanceScheduleMapper.java index 73e5d0d5..e67bad0c 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsAttendanceScheduleMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsAttendanceScheduleMapper.java @@ -25,7 +25,8 @@ public interface WmsAttendanceScheduleMapper extends BaseMapperPlus userIds); /** * 分页查询排班列表（关联员工和班次信息） diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java index 483712ad..cde0599a 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java @@ -102,6 +102,7 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService WmsAttendanceScheduleBo scheduleBo = new WmsAttendanceScheduleBo(); scheduleBo.setStartDate(bo.getStartDate()); scheduleBo.setEndDate(bo.getEndDate()); + scheduleBo.setUserIds(bo.getUserIds()); List schedules = scheduleService.queryList(scheduleBo); if (schedules.isEmpty()) { diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceScheduleServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceScheduleServiceImpl.java index d9848854..bd031c7a 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceScheduleServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceScheduleServiceImpl.java @@ -55,7 +55,7 @@ public class WmsAttendanceScheduleServiceImpl implements IWmsAttendanceScheduleS // 使用关联查询获取详细信息 List list = baseMapper.selectScheduleWithDetails( - schedule.getUserId(), schedule.getWorkDate(), schedule.getShiftId(),null, null); + schedule.getUserId(), schedule.getWorkDate(), schedule.getShiftId(),null, null, null); return list.isEmpty() ? null : list.get(0); } @@ -81,7 +81,7 @@ public class WmsAttendanceScheduleServiceImpl implements IWmsAttendanceScheduleS @Override public List queryList(WmsAttendanceScheduleBo bo) { return baseMapper.selectScheduleWithDetails(bo.getUserId(), bo.getWorkDate(), bo.getShiftId(), - bo.getStartDate(), bo.getEndDate()); + bo.getStartDate(), bo.getEndDate(), bo.getUserIds()); } /** diff --git a/klp-wms/src/main/resources/mapper/klp/WmsAttendanceScheduleMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsAttendanceScheduleMapper.xml index 2f25c226..3254a0ff 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsAttendanceScheduleMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsAttendanceScheduleMapper.xml @@ -66,6 +66,12 @@ AND s.work_date <= #{endDate} + + AND s.user_id IN + + #{userIdItem} + + ORDER BY s.work_date DESC, s.user_id