From 7e07b6f97054c55135da3ac86496f1fa62e932d9 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 6 Jun 2026 10:13:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms/attendance-check):=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BC=82=E5=B8=B8=E8=80=83=E5=8B=A4=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 在考勤审核查询条件中增加异常标识字段abnormal，用于筛选异常考勤记录 2. 在服务层实现异常筛选逻辑：当abnormal为true时，查询整体状态不为"normal"的考勤记录 调整前，考勤审核查询无法直接筛选异常考勤；调整后，支持通过abnormal字段快速过滤出异常状态的考勤记录，提升审核效率。 --- .../src/main/java/com/klp/domain/bo/WmsAttendanceCheckBo.java | 2 ++ .../com/klp/service/impl/WmsAttendanceCheckServiceImpl.java | 3 +++ 2 files changed, 5 insertions(+) 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; }