From adcdd0086b0ad6ae089407cd29568adf30d8e4fd Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 27 May 2025 18:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=A0=82=E6=8A=95=E8=AF=89=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/basic/domain/BasicCanteenEvaluate.java |  8 ++++++++
 .../basic/domain/BasicCanteenSuggestion.java    |  6 ++++++
 .../mapper/basic/BasicCanteenEvaluateMapper.xml |  4 ++++
 .../basic/BasicCanteenSuggestionMapper.xml      | 17 ++++++++++-------
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenEvaluate.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenEvaluate.java
index 4973eb6..34f1e7a 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenEvaluate.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenEvaluate.java
@@ -30,21 +30,29 @@ public class BasicCanteenEvaluate extends BaseEntity {
     @ApiModelProperty(value = "人员ID")
     private Long userId;
 
+    private String nickName;
+
     /**  区域ID */
     @Excel(name = " 区域ID")
     @ApiModelProperty(value = " 区域ID")
     private Long areaId;
 
+    private String areaName;
+
     /** 食堂ID */
     @Excel(name = "食堂ID")
     @ApiModelProperty(value = "食堂ID")
     private Long canteenId;
 
+    private String canteenName;
+
     /** 档口ID */
     @Excel(name = "档口ID")
     @ApiModelProperty(value = "档口ID")
     private Long stallId;
 
+    private String stallName;
+
     /** 评价日期 */
     @ApiModelProperty(value = "评价日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenSuggestion.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenSuggestion.java
index c933040..677643e 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenSuggestion.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenSuggestion.java
@@ -55,6 +55,12 @@ public class BasicCanteenSuggestion extends BaseEntity {
     @ApiModelProperty(value = "是否回复(1是,2否)")
     private Long replyState;
 
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
     /** 回复者用户id */
     @Excel(name = "回复者用户id")
     @ApiModelProperty(value = "回复者用户id")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenEvaluateMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenEvaluateMapper.xml
index 256ea06..5c991d3 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenEvaluateMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenEvaluateMapper.xml
@@ -6,9 +6,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.bonus.canteen.core.basic.domain.BasicCanteenEvaluate" id="BasicCanteenEvaluateResult">
         <result property="evaluateId"    column="evaluate_id"    />
         <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
         <result property="areaId"    column="area_id"    />
+        <result property="areaName"    column="area_name"    />
         <result property="canteenId"    column="canteen_id"    />
+        <result property="canteenName"    column="canteen_name"    />
         <result property="stallId"    column="stall_id"    />
+        <result property="stallName"    column="stall_name"    />
         <result property="evaluateDate"    column="evaluate_date"    />
         <result property="appearance"    column="appearance"    />
         <result property="attitude"    column="attitude"    />
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionMapper.xml
index 03210c9..207ac7c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionMapper.xml
@@ -30,13 +30,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasicCanteenSuggestionList" parameterType="com.bonus.canteen.core.basic.domain.BasicCanteenSuggestion" resultMap="BasicCanteenSuggestionResult">
         <include refid="selectBasicCanteenSuggestionVo"/>
         <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="canteenId != null "> and canteen_id = #{canteenId}</if>
-            <if test="contactTel != null  and contactTel != ''"> and contact_tel = #{contactTel}</if>
-            <if test="replyContent != null  and replyContent != ''"> and reply_content = #{replyContent}</if>
-            <if test="replyState != null "> and reply_state = #{replyState}</if>
-            <if test="replyUserId != null "> and reply_user_id = #{replyUserId}</if>
+            <if test="userId != null "> and bcs.user_id = #{userId}</if>
+            <if test="content != null  and content != ''"> and bcs.content like concat('%', #{content}, '%')</if>
+            <if test="canteenId != null "> and bcs.canteen_id = #{canteenId}</if>
+            <if test="contactTel != null  and contactTel != ''"> and bcs.contact_tel = #{contactTel}</if>
+            <if test="replyContent != null  and replyContent != ''"> and bcs.reply_content = #{replyContent}</if>
+            <if test="replyState != null "> and bcs.reply_state = #{replyState}</if>
+            <if test="replyUserId != null "> and bcs.reply_user_id = #{replyUserId}</if>
+            <if test="startTime!=null and startTime!='' and endTime!=null and endTime!=''">
+                and bcs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime},' 23:59:59')
+            </if>
         </where>
     </select>