From c8ac535ffbd9ba8eb6f9e39426686385493ec704 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 26 May 2026 17:01:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms/attendance):=20=E5=B0=86=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=94=B9=E4=B8=BAPOST=E8=AF=B7=E6=B1=82=E5=B9=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=91=98=E5=B7=A5ID=E9=9B=86=E5=90=88=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在WmsAttendanceCheckBo中新增userIds字段用于接收员工ID集合查询条件。将WmsAttendanceCheckController的/list接口从GET改为POST,并添加@RequestBody注解以支持JSON参数传递。在WmsAttendanceCheckServiceImpl的查询条件构建中增加对userIds字段的筛选逻辑,实现按指定员工范围查询考勤数据。 --- .../java/com/klp/controller/WmsAttendanceCheckController.java | 4 ++-- .../src/main/java/com/klp/domain/bo/WmsAttendanceCheckBo.java | 3 +++ .../com/klp/service/impl/WmsAttendanceCheckServiceImpl.java | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java b/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java index 5548eddf..5f4cada4 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java @@ -34,8 +34,8 @@ public class WmsAttendanceCheckController extends BaseController { private final IWmsAttendanceCheckService iWmsAttendanceCheckService; - @GetMapping("/list") - public TableDataInfo list(WmsAttendanceCheckBo bo, PageQuery pageQuery) { + @PostMapping("/list") + public TableDataInfo list(@RequestBody WmsAttendanceCheckBo bo, PageQuery pageQuery) { return iWmsAttendanceCheckService.queryPageList(bo, pageQuery); } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceCheckBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceCheckBo.java index 079fbfed..0384d590 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceCheckBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceCheckBo.java @@ -8,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; +import java.util.List; @Data @EqualsAndHashCode(callSuper = true) @@ -41,4 +42,6 @@ public class WmsAttendanceCheckBo extends BaseEntity { private BigDecimal totalDeduct; private String overallStatus; private String remark; + + List 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 cde0599a..71f0ed1e 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 @@ -92,6 +92,7 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService lqw.eq(bo.getShiftId() != null, WmsAttendanceCheck::getShiftId, bo.getShiftId()); lqw.ge(bo.getStartDate() != null, WmsAttendanceCheck::getWorkDate, bo.getStartDate()); lqw.le(bo.getEndDate() != null, WmsAttendanceCheck::getWorkDate, bo.getEndDate()); + lqw.in(bo.getUserIds() != null, WmsAttendanceCheck::getUserId, bo.getUserIds()); lqw.orderByDesc(WmsAttendanceCheck::getWorkDate); return lqw; }