From 7b55f358b4e8250c1a2e81af438f82827f5d5d12 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 16 Apr 2026 09:15:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(WmsCoilPendingAction):=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=8C=89=E5=A4=9A=E4=B8=AA=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=BE=85=E5=8A=9E=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsCoilPendingActionBo中新增createBys字段用于接收多个创建人参数 - 修改查询条件支持逗号分隔的多个创建人筛选功能 - 实现将createBys字符串拆分为列表并进行in查询的逻辑 - 添加空值过滤和字符串清理确保查询准确性 --- .../com/klp/domain/bo/WmsCoilPendingActionBo.java | 2 ++ .../impl/WmsCoilPendingActionServiceImpl.java | 12 ++++++++++-- 2 files changed, 12 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 ef74a95c..cf2b9480 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 @@ -126,5 +126,7 @@ public class WmsCoilPendingActionBo extends BaseEntity { // 钢卷ID列表（逗号分隔） private String coilIds; + + private String createBys; } 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 6b866227..433b6e72 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 @@ -128,8 +128,16 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer qw.le(bo.getEndTime() != null, "wcpa.complete_time", bo.getEndTime()); // 根据更新人查询 qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "wcpa.update_by", bo.getUpdateBy()); - // 根据创建人筛选 - qw.eq(StringUtils.isNotBlank(bo.getCreateBy()), "wcpa.create_by", bo.getCreateBy()); + // 根据创建人筛选（支持逗号分隔的多个创建人） + if (StringUtils.isNotBlank(bo.getCreateBys())) { + List createByList = Arrays.stream(bo.getCreateBys().split(",")) + .filter(StringUtils::isNotBlank) + .map(String::trim) + .collect(Collectors.toList()); + if (!createByList.isEmpty()) { + qw.in("wcpa.create_by", createByList); + } + } // 加工后的钢卷ids qw.like(StringUtils.isNotBlank(bo.getProcessedCoilIds()), "wcpa.processed_coil_ids", bo.getProcessedCoilIds()); //逻辑删除 - 支持查询已删除记录