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 0384d590..cae1784d 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 @@ -44,4 +44,6 @@ public class WmsAttendanceCheckBo extends BaseEntity { private String remark; List userIds; + + private Boolean abnormal; } 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 8f1dfa0d..1835ba1d 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 @@ -98,6 +98,9 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService 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()); + if (Boolean.TRUE.equals(bo.getAbnormal())){ + lqw.ne(WmsAttendanceCheck::getOverallStatus, "normal"); + } lqw.orderByDesc(WmsAttendanceCheck::getWorkDate); return lqw; }