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