From 980fbe39eafa75eaa87ca9d1bf2e34f5a53b7388 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 8 May 2025 14:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=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

---
 .../core/menu/domain/MenuEvaluaOrder.java     |  3 ++
 .../mapper/menu/MenuEvaluaOrderMapper.xml     | 32 ++++++++++---------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaOrder.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaOrder.java
index fe966f7..594bead 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaOrder.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaOrder.java
@@ -57,6 +57,9 @@ public class MenuEvaluaOrder extends BaseEntity {
     @ApiModelProperty(value = "档口或店铺id")
     private Long shopstallId;
 
+    @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/menu/MenuEvaluaOrderMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaOrderMapper.xml
index d200517..a3cbde4 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaOrderMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaOrderMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reply"    column="reply"    />
         <result property="replyTime"    column="reply_time"    />
         <result property="shopstallId"    column="shopstall_id"    />
+        <result property="stallName"    column="stall_name"    />
         <result property="showFlag"    column="show_flag"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="revision"    column="revision"    />
@@ -22,31 +23,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMenuEvaluaOrderVo">
-        select evalua_id, ord_id, star_level, description, reply, reply_time,
-               shopstall_id, show_flag, del_flag, revision, order_evalua_type,
-               create_by, create_time, update_by, update_time
-        from menu_evalua_order
+        select meo.evalua_id, meo.ord_id, meo.star_level, meo.description, meo.reply, meo.reply_time,
+               meo.shopstall_id, meo.show_flag, meo.del_flag, meo.revision, meo.order_evalua_type,
+               meo.create_by, meo.create_time, meo.update_by, meo.update_time, ast.stall_name
+        from menu_evalua_order meo
+        left join alloc_stall ast on meo.shopstall_id = ast.stall_id
     </sql>
 
     <select id="selectMenuEvaluaOrderList" parameterType="com.bonus.canteen.core.menu.domain.MenuEvaluaOrder" resultMap="MenuEvaluaOrderResult">
         <include refid="selectMenuEvaluaOrderVo"/>
         <where>  
-            <if test="evaluaId != null "> and evalua_id = #{evaluaId}</if>
-            <if test="ordId != null "> and ord_id = #{ordId}</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="shopstallId != null "> and shopstall_id = #{shopstallId}</if>
-            <if test="showFlag != null "> and show_flag = #{showFlag}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-            <if test="orderEvaluaType != null "> and order_evalua_type = #{orderEvaluaType}</if>
+            <if test="evaluaId != null "> and meo.evalua_id = #{evaluaId}</if>
+            <if test="ordId != null "> and meo.ord_id = #{ordId}</if>
+            <if test="starLevel != null "> and meo.star_level = #{starLevel}</if>
+            <if test="description != null  and description != ''"> and meo.description = #{description}</if>
+            <if test="reply != null  and reply != ''"> and meo.reply = #{reply}</if>
+            <if test="replyTime != null "> and meo.reply_time = #{replyTime}</if>
+            <if test="shopstallId != null "> and meo.shopstall_id = #{shopstallId}</if>
+            <if test="showFlag != null "> and meo.show_flag = #{showFlag}</if>
+            <if test="revision != null "> and meo.revision = #{revision}</if>
+            <if test="orderEvaluaType != null "> and meo.order_evalua_type = #{orderEvaluaType}</if>
         </where>
     </select>
     
     <select id="selectMenuEvaluaOrderById" parameterType="Long" resultMap="MenuEvaluaOrderResult">
         <include refid="selectMenuEvaluaOrderVo"/>
-        where ord_id = #{orderId}
+        where meo.ord_id = #{orderId}
     </select>
         
     <insert id="insertMenuEvaluaOrder" parameterType="com.bonus.canteen.core.menu.dto.MenuEvaluaOrderAddDTO" useGeneratedKeys="true" keyProperty="evaluaId">