From 0d72b09f48ca7606b98a3534f30c17a889f2f82b Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 17 Jun 2025 13:48:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=84=E4=BB=B7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A1=A3=E5=8F=A3=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/cook/domain/CookEvaluaOrder.java     |  3 ++
 .../mapper/cook/CookEvaluaOrderMapper.xml     | 31 ++++++++++---------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java
index 964f2a6..5a2d7df 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java
@@ -60,6 +60,9 @@ public class CookEvaluaOrder extends BaseEntity {
     @ApiModelProperty(value = "档口或店铺id")
     private Long stallId;
 
+    @ApiModelProperty(value = "档口名称")
+    private String stallName;
+
     /** 展示状态(1-展示,2-不展示) */
     @Excel(name = "展示状态(1-展示,2-不展示)")
     @ApiModelProperty(value = "展示状态(1-展示,2-不展示)")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml
index 439684b..87a10b3 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reply"    column="reply"    />
         <result property="replyTime"    column="reply_time"    />
         <result property="stallId"    column="stall_id"    />
+        <result property="stallName"    column="stall_name"    />
         <result property="showFlag"    column="show_flag"    />
         <result property="orderEvaluaType"    column="order_evalua_type"    />
         <result property="createBy"    column="create_by"    />
@@ -21,34 +22,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCookEvaluaOrderVo">
-        select evalua_id, user_id, order_id, star_level, description, reply, reply_time, stall_id,
-               show_flag, order_evalua_type, create_by, create_time, update_by, update_time
-        from cook_evalua_order
+        select ceo.evalua_id, ceo.user_id, ceo.order_id, ceo.star_level, ceo.description, ceo.reply, ceo.reply_time,
+               ceo.stall_id, ceo.show_flag, ceo.order_evalua_type, ceo.create_by, ceo.create_time, ceo.update_by,
+               ceo.update_time, bs.stall_name
+        from cook_evalua_order ceo
+        left join basic_stall bs on bs.stall_id = ceo.stall_id
     </sql>
 
     <select id="selectCookEvaluaOrderList" parameterType="com.bonus.canteen.core.cook.domain.CookEvaluaOrder" resultMap="CookEvaluaOrderResult">
         <include refid="selectCookEvaluaOrderVo"/>
         <where>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="orderId != null "> and order_id = #{orderId}</if>
-            <if test="starLevel != null "> and star_level = #{starLevel}</if>
-            <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="reply != null  and reply != ''"> and reply = #{reply}</if>
-            <if test="replyTime != null "> and reply_time = #{replyTime}</if>
-            <if test="stallId != null "> and stall_id = #{stallId}</if>
-            <if test="showFlag != null "> and show_flag = #{showFlag}</if>
-            <if test="orderEvaluaType != null "> and order_evalua_type = #{orderEvaluaType}</if>
+            <if test="userId != null "> and ceo.user_id = #{userId}</if>
+            <if test="orderId != null "> and ceo.order_id = #{orderId}</if>
+            <if test="starLevel != null "> and ceo.star_level = #{starLevel}</if>
+            <if test="description != null  and description != ''"> and ceo.description = #{description}</if>
+            <if test="reply != null  and reply != ''"> and ceo.reply = #{reply}</if>
+            <if test="replyTime != null "> and ceo.reply_time = #{replyTime}</if>
+            <if test="stallId != null "> and ceo.stall_id = #{stallId}</if>
+            <if test="showFlag != null "> and ceo.show_flag = #{showFlag}</if>
+            <if test="orderEvaluaType != null "> and ceo.order_evalua_type = #{orderEvaluaType}</if>
         </where>
     </select>
     
     <select id="selectCookEvaluaOrderByEvaluaId" parameterType="Long" resultMap="CookEvaluaOrderResult">
         <include refid="selectCookEvaluaOrderVo"/>
-        where evalua_id = #{evaluaId}
+        where ceo.evalua_id = #{evaluaId}
     </select>
 
     <select id="selectCookEvaluaOrderByOrderId" parameterType="Long" resultMap="CookEvaluaOrderResult">
         <include refid="selectCookEvaluaOrderVo"/>
-        where order_id = #{orderId}
+        where ceo.order_id = #{orderId}
     </select>
         
     <insert id="insertCookEvaluaOrder" parameterType="com.bonus.canteen.core.cook.domain.CookEvaluaOrder" useGeneratedKeys="true" keyProperty="evaluaId">