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 aafd4b6c..672b4758 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java @@ -35,6 +35,14 @@ public class WmsBonusPool extends BaseEntity { * 奖金时间/统计时间 */ private Date bonusTime; + /** + * 开始时间 + */ + private Date bonusStartTime; + /** + * 结束时间 + */ + private Date bonusEndTime; /** * 奖金池总金额 */ 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 0c3518f3..f2896200 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 @@ -38,6 +38,20 @@ public class WmsBonusPoolBo extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") private Date bonusTime; + /** + * 开始时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date bonusStartTime; + + /** + * 结束时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date bonusEndTime; + /** * 奖金池总金额 */ 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 b1d54a2f..dcb1c5c6 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 @@ -39,8 +39,23 @@ public class WmsBonusPoolVo extends BaseEntity { * 奖金时间/统计时间 */ @ExcelProperty(value = "奖金时间/统计时间") + @JsonFormat(pattern = "yyyy-MM-dd") private Date bonusTime; + /** + * 开始时间 + */ + @ExcelProperty(value = "开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date bonusStartTime; + + /** + * 结束时间 + */ + @ExcelProperty(value = "结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date bonusEndTime; + /** * 奖金池总金额 */ 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 be495ea0..9e02bd44 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 @@ -63,6 +63,8 @@ public class WmsBonusPoolServiceImpl implements IWmsBonusPoolService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); 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()); + lqw.eq(bo.getBonusEndTime() != null, WmsBonusPool::getBonusEndTime, bo.getBonusEndTime()); lqw.eq(bo.getTotalBonus() != null, WmsBonusPool::getTotalBonus, bo.getTotalBonus()); lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), WmsBonusPool::getCreateBy, bo.getCreateBy()); return lqw; diff --git a/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml index eb709c3c..a36fc2e5 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml @@ -8,6 +8,8 @@ + +