From f51731113fceb654f35f7777831c8528a016f986 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 22 Sep 2025 13:40:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(gear-oa):=20=E6=B7=BB=E5=8A=A0=E5=BA=94?=
 =?UTF-8?q?=E6=94=B6=E5=BA=94=E4=BB=98=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为 GearPayableBo 和 GearReceivableBo 添加 startTime 和 endTime 字段，
并支持在服务层根据创建时间进行时间段筛选。
---
 .../src/main/java/com/gear/oa/domain/bo/GearPayableBo.java  | 6 +++++-
 .../main/java/com/gear/oa/domain/bo/GearReceivableBo.java   | 6 ++++++
 .../com/gear/oa/service/impl/GearPayableServiceImpl.java    | 2 ++
 .../com/gear/oa/service/impl/GearReceivableServiceImpl.java | 2 ++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java
index a567737..b26dcdb 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java
@@ -74,6 +74,10 @@ public class GearPayableBo extends BaseEntity {
 
     //采购详情id
     private Long detailId;
-
+    //时间范围筛选
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
 }
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearReceivableBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearReceivableBo.java
index ddc4236..4594d4d 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearReceivableBo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearReceivableBo.java
@@ -72,5 +72,11 @@ public class GearReceivableBo extends BaseEntity {
      */
     private String remark;
 
+    //时间范围筛选
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
 
 }
diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java
index 6516fc9..37a7dae 100644
--- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java
+++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java
@@ -73,6 +73,8 @@ public class GearPayableServiceImpl implements IGearPayableService {
         lqw.eq(bo.getPaidAmount() != null, "p.paid_amount", bo.getPaidAmount());
         lqw.eq(bo.getBalanceAmount() != null, "p.balance_amount", bo.getBalanceAmount());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), "p.status", bo.getStatus());
+        //按照时间段筛选 用创建时间比较
+        lqw.between(bo.getStartTime() != null && bo.getEndTime() != null, "p.create_time", bo.getStartTime(), bo.getEndTime());
         return lqw;
     }
     /**
diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearReceivableServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearReceivableServiceImpl.java
index bd8177b..2a28606 100644
--- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearReceivableServiceImpl.java
+++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearReceivableServiceImpl.java
@@ -73,6 +73,8 @@ public class GearReceivableServiceImpl implements IGearReceivableService {
         lqw.eq(bo.getPaidAmount() != null, "r.paid_amount", bo.getPaidAmount());
         lqw.eq(bo.getBalanceAmount() != null, "r.balance_amount", bo.getBalanceAmount());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), "r.status", bo.getStatus());
+        //按照时间段筛选 用创建时间比较
+        lqw.between(bo.getStartTime() != null && bo.getEndTime() != null, "r.create_time", bo.getStartTime(), bo.getEndTime());
         return lqw;
     }
     /**