From 14757f359b5f0ca822f4d5aa780de0b954da5d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=BA=86=E6=B3=B0?=
 <12369755+htcloud1@user.noreply.gitee.com>
Date: Tue, 18 Aug 2026 23:20:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(meetings):=20selectList=20=E5=8A=A0=207=20?=
 =?UTF-8?q?=E4=B8=AA=E7=AD=9B=E9=80=89=20if=20(P0#1),=20Date=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8A=A0=20@DateTimeFormat=20=E8=AE=A9=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E8=83=BD=20Spring=20=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/business/domain/BizMeeting.java   | 3 +++
 .../main/resources/mapper/business/BizMeetingMapper.xml   | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMeeting.java b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMeeting.java
index 0b4887f..6cb9314 100644
--- a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMeeting.java
+++ b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMeeting.java
@@ -3,6 +3,7 @@ package com.ruoyi.business.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -26,10 +27,12 @@ public class BizMeeting extends BaseEntity {
     /** start_time */
     @Excel(name = "start_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
     /** end_time */
     @Excel(name = "end_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
     /** total_periods */
     @Excel(name = "total_periods")
diff --git a/ry-api/ruoyi-business/src/main/resources/mapper/business/BizMeetingMapper.xml b/ry-api/ruoyi-business/src/main/resources/mapper/business/BizMeetingMapper.xml
index 27ce737..e2e1511 100644
--- a/ry-api/ruoyi-business/src/main/resources/mapper/business/BizMeetingMapper.xml
+++ b/ry-api/ruoyi-business/src/main/resources/mapper/business/BizMeetingMapper.xml
@@ -37,6 +37,14 @@
     <select id="selectList" resultMap="BizMeetingResult" parameterType="BizMeeting">
         <include refid="selectFields"/>
         <where>
+            <if test="projectNo != null and projectNo != ''">and project_no like concat('%', #{projectNo}, '%')</if>
+            <if test="meetingId != null">and meeting_id = #{meetingId}</if>
+            <if test="meetingName != null and meetingName != ''">and meeting_name like concat('%', #{meetingName}, '%')</if>
+            <if test="periodNo != null">and period_no = #{periodNo}</if>
+            <if test="projectForm != null and projectForm != ''">and project_form = #{projectForm}</if>
+            <if test="currentStage != null and currentStage != ''">and current_stage = #{currentStage}</if>
+            <if test="startTime != null">and start_time &gt;= #{startTime}</if>
+            <if test="endTime != null">and end_time &lt;= #{endTime}</if>
         </where>
         order by meeting_id desc
     </select>