From 76fd5446a590a6a775aba8d44b68848132e0a981 Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Tue, 19 Aug 2025 09:16:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E9=97=AE=E9=A2=98=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在OaFeedbackBo 中添加 startTime 和 endTime 字段，用于指定查询的时间区间
- 在 OaFeedbackServiceImpl 中实现时间区间查询的逻辑
- 使用 @DateTimeFormat 注解确保日期格式的一致性
---
 .../java/com/ruoyi/oa/domain/bo/OaFeedbackBo.java | 15 ++++++++++++---
 .../oa/service/impl/OaFeedbackServiceImpl.java    |  3 +++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFeedbackBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFeedbackBo.java
index c440702..61b7368 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFeedbackBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFeedbackBo.java
@@ -1,14 +1,12 @@
 package com.ruoyi.oa.domain.bo;
 
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
 
 import java.util.Date;
 
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 问题反馈业务对象 oa_feedback
@@ -48,4 +46,15 @@ public class OaFeedbackBo extends BaseEntity {
     private String projectName;
 
     private Long projectId;
+    /**
+     * 区间开始时间
+     */
+    @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/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFeedbackServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFeedbackServiceImpl.java
index 2df9b59..cd56d92 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFeedbackServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFeedbackServiceImpl.java
@@ -80,6 +80,9 @@ public class OaFeedbackServiceImpl implements IOaFeedbackService {
         lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_name", bo.getProjectName());
         lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_code", bo.getProjectName());
         lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_num", bo.getProjectName());
+        if (bo.getStartTime() != null && bo.getEndTime() != null) {
+            lqw.between("oaf.create_time", bo.getStartTime(), bo.getEndTime());
+        }
         lqw.orderByDesc("oaf.create_time");
         return lqw;
     }