From 926977bc6c319180952c15e66ec9f97a3c46e039 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 19 Jan 2026 10:59:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor(leave):=20=E4=BC=98=E5=8C=96=E8=AF=B7?=
 =?UTF-8?q?=E5=81=87=E7=94=B3=E8=AF=B7=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除多余的 beginTime 和 endTimeParam 字段
- 为 startTime 和 endTime 添加 JsonFormat 和 DateTimeFormat 注解
- 更新服务层时间范围筛选逻辑，使用 startTime 和 endTime 替代旧字段
- 统一时间格式化为 yyyy-MM-dd 格式
- 简化查询条件中的时间比较逻辑
---
 .../com/klp/domain/bo/WmsLeaveRequestBo.java  | 15 ++++------
 .../impl/WmsLeaveRequestServiceImpl.java      | 30 +++++++++----------
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java
index 2887fb52..795c2400 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java
@@ -8,6 +8,7 @@ import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 员工请假申请业务对象 wms_leave_request
@@ -48,23 +49,17 @@ public class WmsLeaveRequestBo extends BaseEntity {
     /**
      * 请假开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
 
     /**
      * 请假结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
-    /**
-     * 查询开始时间（用于筛选请假时间范围）
-     */
-    private Date beginTime;
-
-    /**
-     * 查询结束时间（用于筛选请假时间范围）
-     */
-    private Date endTimeParam;
-
     /**
      * 导出ID列表（逗号分隔）
      */
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java
index 126db7f1..768832f8 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java
@@ -86,14 +86,14 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService {
             lqw.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), WmsLeaveRequest::getApplicantDeptName, bo.getApplicantDeptName());
 
             // 请假时间范围筛选：筛选出请假时间与查询时间范围有交集的记录
-            // 条件：(start_time <= endTimeParam AND end_time >= beginTime)
-            if (bo.getBeginTime() != null && bo.getEndTimeParam() != null) {
-                lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTimeParam())
-                   .ge(WmsLeaveRequest::getEndTime, bo.getBeginTime());
-            } else if (bo.getBeginTime() != null) {
-                lqw.ge(WmsLeaveRequest::getEndTime, bo.getBeginTime());
-            } else if (bo.getEndTimeParam() != null) {
-                lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTimeParam());
+            // 条件：(start_time <= endTime AND end_time >= startTime)
+            if (bo.getStartTime() != null && bo.getEndTime() != null) {
+                lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTime())
+                   .ge(WmsLeaveRequest::getEndTime, bo.getStartTime());
+            } else if (bo.getStartTime() != null) {
+                lqw.ge(WmsLeaveRequest::getEndTime, bo.getStartTime());
+            } else if (bo.getEndTime() != null) {
+                lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTime());
             }
 
             lqw.eq(bo.getStartTime() != null, WmsLeaveRequest::getStartTime, bo.getStartTime());
@@ -222,13 +222,13 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService {
            .eq("del_flag", 0);
 
         // 时间范围筛选
-        if (bo.getBeginTime() != null && bo.getEndTimeParam() != null) {
-            qw.le("start_time", bo.getEndTimeParam())
-               .ge("end_time", bo.getBeginTime());
-        } else if (bo.getBeginTime() != null) {
-            qw.ge("end_time", bo.getBeginTime());
-        } else if (bo.getEndTimeParam() != null) {
-            qw.le("start_time", bo.getEndTimeParam());
+        if (bo.getStartTime() != null && bo.getEndTime() != null) {
+            qw.le("start_time", bo.getEndTime())
+               .ge("end_time", bo.getStartTime());
+        } else if (bo.getStartTime() != null) {
+            qw.ge("end_time", bo.getStartTime());
+        } else if (bo.getEndTime() != null) {
+            qw.le("start_time", bo.getEndTime());
         }
 
         // 其他筛选条件