From 94b3b703607833880b0bac467a3e7b41818aaeae Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 11 May 2026 10:56:53 +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=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E5=92=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=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实体类中新增bonusStartTime和bonusEndTime属性
- 在WmsBonusPoolBo业务对象中添加对应的开始结束时间字段及日期格式注解
- 更新MyBatis映射文件中的结果集映射配置
- 在查询条件中加入开始时间和结束时间的筛选逻辑
- 在WmsBonusPoolVo视图对象中添加Excel导出和JSON格式化支持
---
 .../main/java/com/klp/domain/WmsBonusPool.java    |  8 ++++++++
 .../java/com/klp/domain/bo/WmsBonusPoolBo.java    | 14 ++++++++++++++
 .../java/com/klp/domain/vo/WmsBonusPoolVo.java    | 15 +++++++++++++++
 .../klp/service/impl/WmsBonusPoolServiceImpl.java |  2 ++
 .../resources/mapper/klp/WmsBonusPoolMapper.xml   |  2 ++
 5 files changed, 41 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 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<WmsBonusPool> 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 @@
         <result property="poolId" column="pool_id"/>
         <result property="productionLine" column="production_line"/>
         <result property="bonusTime" column="bonus_time"/>
+        <result property="bonusStartTime" column="bonus_start_time"/>
+        <result property="bonusEndTime" column="bonus_end_time"/>
         <result property="totalBonus" column="total_bonus"/>
         <result property="remark" column="remark"/>
         <result property="createBy" column="create_by"/>