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 @@ +