From 950c43f055edaed1c3755a76958afb71c971c4c4 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 19 May 2025 14:37:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E8=AF=89=E5=BB=BA=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/alloc/domain/AllocCanteenSuggestion.java   | 6 ++++++
 .../resources/mapper/alloc/AllocCanteenSuggestionMapper.xml | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteenSuggestion.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteenSuggestion.java
index a5fd6d8..cf3e772 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteenSuggestion.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteenSuggestion.java
@@ -72,6 +72,12 @@ public class AllocCanteenSuggestion extends BaseEntity {
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long replyState;
 
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
     public String getComplaintPicture() {
         return FileUrlUtil.getFileUrl(this.complaintPicture);
     }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenSuggestionMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenSuggestionMapper.xml
index bc91906..536ff74 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenSuggestionMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenSuggestionMapper.xml
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="complaintId != null "> and acs.complaint_id = #{complaintId}</if>
             <if test="userId != null "> and acs.user_id = #{userId}</if>
-            <if test="content != null  and content != ''"> and acs.content = #{content}</if>
+            <if test="content != null  and content != ''"> and acs.content like concat('%', #{content}, '%')</if>
             <if test="canteenId != null "> and acs.canteen_id = #{canteenId}</if>
             <if test="complaintPicture != null  and complaintPicture != ''"> and acs.complaint_picture = #{complaintPicture}</if>
             <if test="sourceType != null "> and acs.source_type = #{sourceType}</if>
@@ -42,6 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="replyContent != null  and replyContent != ''"> and acs.reply_content = #{replyContent}</if>
             <if test="revision != null "> and acs.revision = #{revision}</if>
             <if test="replyState != null "> and acs.reply_state = #{replyState}</if>
+            <if test="startTime!=null and startTime!='' and endTime!=null and endTime!=''">
+                and acs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime},' 23:59:59')
+            </if>
         </where>
     </select>