From 1a6859b6804c7ba96d4f18b98d1f213d2f3654ba Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 8 May 2025 20:26:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=A0=82=E8=AF=84=E4=BB=B7=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alloc/domain/AllocCanteenSuggestion.java  |  3 ++
 .../alloc/AllocCanteenSuggestionMapper.xml    | 31 ++++++++++---------
 2 files changed, 20 insertions(+), 14 deletions(-)

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 c2973fa..a5fd6d8 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
@@ -40,6 +40,9 @@ public class AllocCanteenSuggestion extends BaseEntity {
     @ApiModelProperty(value = "餐厅id")
     private Long canteenId;
 
+    @ApiModelProperty(value = "餐厅名称")
+    private String canteenName;
+
     /** 投诉图片 */
     @Excel(name = "投诉图片")
     @ApiModelProperty(value = "投诉图片")
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 bd9601c..bc91906 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
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId"    column="user_id"    />
         <result property="content"    column="content"    />
         <result property="canteenId"    column="canteen_id"    />
+        <result property="canteenName"    column="canteen_name"    />
         <result property="complaintPicture"    column="complaint_picture"    />
         <result property="sourceType"    column="source_type"    />
         <result property="mobile"    column="mobile"    />
@@ -21,30 +22,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAllocCanteenSuggestionVo">
-        select complaint_id, user_id, content, canteen_id, complaint_picture, source_type, mobile,
-               reply_content, revision, reply_state, create_by, create_time, update_by, update_time
-        from alloc_canteen_suggestion
+        select acs.complaint_id, acs.user_id, acs.content, acs.canteen_id, acs.complaint_picture, acs.source_type,
+               acs.mobile, acs.reply_content, acs.revision, acs.reply_state, acs.create_by, acs.create_time,
+               acs.update_by, acs.update_time, ac.canteen_name
+        from alloc_canteen_suggestion acs
+         left join alloc_canteen ac on acs.canteen_id = ac.canteen_id
     </sql>
 
     <select id="selectAllocCanteenSuggestionList" parameterType="com.bonus.canteen.core.alloc.domain.AllocCanteenSuggestion" resultMap="AllocCanteenSuggestionResult">
         <include refid="selectAllocCanteenSuggestionVo"/>
         <where>  
-            <if test="complaintId != null "> and complaint_id = #{complaintId}</if>
-            <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="complaintPicture != null  and complaintPicture != ''"> and complaint_picture = #{complaintPicture}</if>
-            <if test="sourceType != null "> and source_type = #{sourceType}</if>
-            <if test="mobile != null  and mobile != ''"> and mobile = #{mobile}</if>
-            <if test="replyContent != null  and replyContent != ''"> and reply_content = #{replyContent}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-            <if test="replyState != null "> and reply_state = #{replyState}</if>
+            <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="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>
+            <if test="mobile != null  and mobile != ''"> and acs.mobile = #{mobile}</if>
+            <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>
         </where>
     </select>
     
     <select id="selectAllocCanteenSuggestionById" parameterType="Long" resultMap="AllocCanteenSuggestionResult">
         <include refid="selectAllocCanteenSuggestionVo"/>
-        where complaint_id = #{complaintId}
+        where acs.complaint_id = #{complaintId}
     </select>
         
     <insert id="insertAllocCanteenSuggestion" parameterType="com.bonus.canteen.core.alloc.domain.AllocCanteenSuggestion" useGeneratedKeys="true" keyProperty="complaintId">