From 890c6dd01dc687f52edfa946bb1beddf6e46468e Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 24 Mar 2026 14:21:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E7=B1=BB=E5=9E=8B=E5=A4=9A=E9=80=89=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 - 在 WmsCoilPendingActionBo 中新增 actionTypes 字段支持多选 - 修改查询逻辑以支持单个操作类型或多个操作类型的筛选条件 - 使用 in 条件查询实现多选筛选功能 - 保持原有单选功能的兼容性 - 更新 Lambda 查询方式下的多选逻辑处理 --- .../com/klp/domain/bo/WmsCoilPendingActionBo.java | 6 ++++++ .../impl/WmsCoilPendingActionServiceImpl.java | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java index a13b7ff6..c9fae5ac 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.*; import java.util.Date; +import java.util.List; import com.klp.common.core.domain.BaseEntity; import org.springframework.format.annotation.DateTimeFormat; @@ -45,6 +46,11 @@ public class WmsCoilPendingActionBo extends BaseEntity { @NotNull(message = "操作类型不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer actionType; + /** + * 操作类型集合（用于多选筛选） + */ + private List actionTypes; + /** * 操作状态（0=待处理，1=处理中，2=已完成，3=已取消） */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java index cc68884a..df7edba2 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java @@ -96,7 +96,11 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer QueryWrapper qw = Wrappers.query(); qw.eq(bo.getCoilId() != null, "wcpa.coil_id", bo.getCoilId()); qw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), "wcpa.current_coil_no", bo.getCurrentCoilNo()); - qw.eq(bo.getActionType() != null, "wcpa.action_type", bo.getActionType()); + if (bo.getActionTypes() != null && !bo.getActionTypes().isEmpty()) { + qw.in("wcpa.action_type", bo.getActionTypes()); + } else { + qw.eq(bo.getActionType() != null, "wcpa.action_type", bo.getActionType()); + } if (bo.getActionStatus() != null) { if (bo.getActionStatus() == -1) { qw.ne("wcpa.action_status", 2); @@ -147,7 +151,11 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getCoilId() != null, WmsCoilPendingAction::getCoilId, bo.getCoilId()); lqw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), WmsCoilPendingAction::getCurrentCoilNo, bo.getCurrentCoilNo()); - lqw.eq(bo.getActionType() != null, WmsCoilPendingAction::getActionType, bo.getActionType()); + if (bo.getActionTypes() != null && !bo.getActionTypes().isEmpty()) { + lqw.in(WmsCoilPendingAction::getActionType, bo.getActionTypes()); + } else { + lqw.eq(bo.getActionType() != null, WmsCoilPendingAction::getActionType, bo.getActionType()); + } lqw.eq(bo.getActionStatus() != null, WmsCoilPendingAction::getActionStatus, bo.getActionStatus()); lqw.eq(bo.getWarehouseId() != null, WmsCoilPendingAction::getWarehouseId, bo.getWarehouseId()); lqw.eq(bo.getPriority() != null, WmsCoilPendingAction::getPriority, bo.getPriority()); From 876bb48b1d6bbc42b0ecd19f4701702ef104e51e Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 24 Mar 2026 14:48:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(employee):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=A6=BB=E8=81=8C=E6=97=B6=E9=97=B4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=8A=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsEmployeeInfo实体类中添加离职时间字段 - 在WmsEmployeeInfoBo业务对象中添加离职时间及相关查询条件字段 - 在WmsEmployeeInfoVo视图对象中添加离职时间字段并配置日期格式 - 更新MyBatis映射文件添加离职时间字段映射 - 实现离职时间范围查询功能支持 --- .../main/java/com/klp/domain/WmsEmployeeInfo.java | 3 +++ .../java/com/klp/domain/bo/WmsEmployeeInfoBo.java | 13 +++++++++++++ .../java/com/klp/domain/vo/WmsEmployeeInfoVo.java | 4 ++++ .../service/impl/WmsEmployeeInfoServiceImpl.java | 3 +++ .../resources/mapper/klp/WmsEmployeeInfoMapper.xml | 1 + 5 files changed, 24 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java index 82139702..41f612ab 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java @@ -99,6 +99,9 @@ public class WmsEmployeeInfo extends BaseEntity { // 是否离职 private Integer isLeave; + // 离职时间 + private Date leaveTime; + // 是否转正：0=未转正，1=已转正 private Integer isRegular; diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java index efdd9a37..65d625ac 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java @@ -123,6 +123,19 @@ public class WmsEmployeeInfoBo extends BaseEntity { // 是否离职 private Integer isLeave; + // 离职时间 + private Date leaveTime; + + // 离职时间开始 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date leaveStartTime; + + // 离职时间结束 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date leaveEndTime; + // 是否转正：0=未转正，1=已转正 private Integer isRegular; diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java index bc5896f6..826f8b55 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java @@ -127,6 +127,10 @@ public class WmsEmployeeInfoVo { // 是否离职 private Integer isLeave; + // 离职时间 + @JsonFormat(pattern = "yyyy-MM-dd") + private Date leaveTime; + // 是否转正：0=未转正，1=已转正 private Integer isRegular; diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java index b84e8363..dd65e9f8 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java @@ -80,6 +80,9 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService { lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType()); // 是否离职 lqw.eq(bo.getIsLeave() != null, WmsEmployeeInfo::getIsLeave, bo.getIsLeave()); + // 离职时间范围查询 + lqw.ge(bo.getLeaveStartTime() != null, WmsEmployeeInfo::getLeaveTime, bo.getLeaveStartTime()); + lqw.le(bo.getLeaveEndTime() != null, WmsEmployeeInfo::getLeaveTime, bo.getLeaveEndTime()); // 是否转正 lqw.eq(bo.getIsRegular() != null, WmsEmployeeInfo::getIsRegular, bo.getIsRegular()); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml index 3af9502c..881b0855 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml @@ -28,6 +28,7 @@ +