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