From 2014972e44ec330db0fec92dfdb7c8f58c8af19c Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 13 May 2026 10:47:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(bonus-pool):=20=E6=B7=BB=E5=8A=A0=E5=A5=96?= =?UTF-8?q?=E9=87=91=E6=B1=A0=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsBonusPool 实体类中新增 poolName 字段及注释 - 在 WmsBonusPoolBo 业务对象中添加 poolName 属性 - 更新 WmsBonusPoolMapper.xml 映射文件中的 resultMap 配置 - 在构建查询条件时添加奖金池名称模糊匹配功能 - 在 WmsBonusPoolVo 视图对象中增加 poolName 字段并配置 Excel 导出 --- klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java | 4 ++++ klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java | 5 +++++ klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java | 6 ++++++ .../java/com/klp/service/impl/WmsBonusPoolServiceImpl.java | 1 + .../src/main/resources/mapper/klp/WmsBonusPoolMapper.xml | 1 + 5 files changed, 17 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java b/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java index 672b4758..021a333a 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java @@ -27,6 +27,10 @@ public class WmsBonusPool extends BaseEntity { */ @TableId(value = "pool_id") private Long poolId; + /** + * 奖金池名称 + */ + private String poolName; /** * 产线 */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java index f2896200..80d96ad3 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java @@ -26,6 +26,11 @@ public class WmsBonusPoolBo extends BaseEntity { */ private Long poolId; + /** + * 奖金池名称 + */ + private String poolName; + /** * 产线 */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java index dcb1c5c6..c27c960f 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java @@ -29,6 +29,12 @@ public class WmsBonusPoolVo extends BaseEntity { @ExcelProperty(value = "主键ID") private Long poolId; + /** + * 奖金池名称 + */ + @ExcelProperty(value = "奖金池名称") + private String poolName; + /** * 产线 */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java index 9e02bd44..3e977e6e 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java @@ -61,6 +61,7 @@ public class WmsBonusPoolServiceImpl implements IWmsBonusPoolService { private LambdaQueryWrapper buildQueryWrapper(WmsBonusPoolBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getPoolName()), WmsBonusPool::getPoolName, bo.getPoolName()); lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), WmsBonusPool::getProductionLine, bo.getProductionLine()); lqw.eq(bo.getBonusTime() != null, WmsBonusPool::getBonusTime, bo.getBonusTime()); lqw.eq(bo.getBonusStartTime() != null, WmsBonusPool::getBonusStartTime, bo.getBonusStartTime()); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml index a36fc2e5..959317a8 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml @@ -6,6 +6,7 @@ +