From e79fd2887a32e90dd70834cd8e825144b038b021 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 8 Apr 2025 13:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=A3=9F=E5=A0=82=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/alloc/domain/AllocCanteen.java       |  5 ++
 .../canteen/core/alloc/domain/AllocStall.java | 10 ++++
 .../mapper/alloc/AllocCanteenMapper.xml       | 45 ++++++++-------
 .../mapper/alloc/AllocStallMapper.xml         | 56 +++++++++++--------
 4 files changed, 72 insertions(+), 44 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java
index cffafc6..0cd4593 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java
@@ -34,6 +34,11 @@ public class AllocCanteen extends BaseEntity {
     @ApiModelProperty(value = "区域id")
     private Long areaId;
 
+    /** 当前区域名称 */
+    @Excel(name = "当前区域名称")
+    @ApiModelProperty(value = "当前区域名称")
+    private String areaName;
+
     /** 食堂业务类型 1-食堂 2-超市 */
     @Excel(name = "食堂业务类型 1-食堂 2-超市")
     @ApiModelProperty(value = "食堂业务类型 1-食堂 2-超市")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java
index 2426881..07d4208 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java
@@ -34,11 +34,21 @@ public class AllocStall extends BaseEntity {
     @ApiModelProperty(value = "区域id")
     private Long areaId;
 
+    /** 当前区域名称 */
+    @Excel(name = "当前区域名称")
+    @ApiModelProperty(value = "当前区域名称")
+    private String areaName;
+
     /** 食堂id */
     @Excel(name = "食堂id")
     @ApiModelProperty(value = "食堂id")
     private Long canteenId;
 
+    /** 食堂名称 */
+    @Excel(name = "食堂名称")
+    @ApiModelProperty(value = "食堂名称")
+    private String canteenName;
+
     /** 档口业务类型 1-档口 */
     @Excel(name = "档口业务类型 1-档口")
     @ApiModelProperty(value = "档口业务类型 1-档口")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenMapper.xml
index 3278610..63ef74f 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenMapper.xml
@@ -32,36 +32,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAllocCanteenVo">
-        select canteen_id, canteen_name, area_id, canteen_type, director, contact_tel, business_state, start_business_time, end_business_time, img_url, if_enable_pay, pay_types, if_enable_delivery, deliveries, if_enable_order, if_book, if_reserve, if_enable_pay_code, pay_code_url, del_flag, create_by, create_time, update_by, update_time, remark from alloc_canteen
+        select ac.canteen_id, ac.canteen_name, aa.area_name, ac.area_id, ac.canteen_type, ac.director, ac.contact_tel, ac.business_state,
+               ac.start_business_time, ac.end_business_time, ac.img_url, ac.if_enable_pay, ac.pay_types, ac.if_enable_delivery,
+               ac.deliveries, ac.if_enable_order, ac.if_book, ac.if_reserve, ac.if_enable_pay_code, ac.pay_code_url, ac.del_flag,
+               ac.create_by, ac.create_time, ac.update_by, ac.update_time, ac.remark
+        from alloc_canteen ac
+        left join alloc_area aa on ac.area_id = aa.area_id
     </sql>
 
     <select id="selectAllocCanteenList" parameterType="com.bonus.canteen.core.alloc.domain.AllocCanteen" resultMap="AllocCanteenResult">
         <include refid="selectAllocCanteenVo"/>
         <where>  
-            <if test="canteenName != null  and canteenName != ''"> and canteen_name like concat('%', #{canteenName}, '%')</if>
-            <if test="areaId != null "> and area_id = #{areaId}</if>
-            <if test="canteenType != null "> and canteen_type = #{canteenType}</if>
-            <if test="director != null "> and director = #{director}</if>
-            <if test="contactTel != null  and contactTel != ''"> and contact_tel = #{contactTel}</if>
-            <if test="businessState != null "> and business_state = #{businessState}</if>
-            <if test="startBusinessTime != null "> and start_business_time = #{startBusinessTime}</if>
-            <if test="endBusinessTime != null "> and end_business_time = #{endBusinessTime}</if>
-            <if test="imgUrl != null  and imgUrl != ''"> and img_url = #{imgUrl}</if>
-            <if test="ifEnablePay != null "> and if_enable_pay = #{ifEnablePay}</if>
-            <if test="payTypes != null  and payTypes != ''"> and pay_types = #{payTypes}</if>
-            <if test="ifEnableDelivery != null "> and if_enable_delivery = #{ifEnableDelivery}</if>
-            <if test="deliveries != null  and deliveries != ''"> and deliveries = #{deliveries}</if>
-            <if test="ifEnableOrder != null "> and if_enable_order = #{ifEnableOrder}</if>
-            <if test="ifBook != null "> and if_book = #{ifBook}</if>
-            <if test="ifReserve != null "> and if_reserve = #{ifReserve}</if>
-            <if test="ifEnablePayCode != null "> and if_enable_pay_code = #{ifEnablePayCode}</if>
-            <if test="payCodeUrl != null  and payCodeUrl != ''"> and pay_code_url = #{payCodeUrl}</if>
+            <if test="canteenName != null  and canteenName != ''"> and ac.canteen_name like concat('%', #{canteenName}, '%')</if>
+            <if test="areaId != null "> and ac.area_id = #{areaId}</if>
+            <if test="canteenType != null "> and ac.canteen_type = #{canteenType}</if>
+            <if test="director != null "> and ac.director = #{director}</if>
+            <if test="contactTel != null  and contactTel != ''"> and ac.contact_tel = #{contactTel}</if>
+            <if test="businessState != null "> and ac.business_state = #{businessState}</if>
+            <if test="startBusinessTime != null "> and ac.start_business_time = #{startBusinessTime}</if>
+            <if test="endBusinessTime != null "> and ac.end_business_time = #{endBusinessTime}</if>
+            <if test="imgUrl != null  and imgUrl != ''"> and ac.img_url = #{imgUrl}</if>
+            <if test="ifEnablePay != null "> and ac.if_enable_pay = #{ifEnablePay}</if>
+            <if test="payTypes != null  and payTypes != ''"> and ac.pay_types = #{payTypes}</if>
+            <if test="ifEnableDelivery != null "> and ac.if_enable_delivery = #{ifEnableDelivery}</if>
+            <if test="deliveries != null  and deliveries != ''"> and ac.deliveries = #{deliveries}</if>
+            <if test="ifEnableOrder != null "> and ac.if_enable_order = #{ifEnableOrder}</if>
+            <if test="ifBook != null "> and ac.if_book = #{ifBook}</if>
+            <if test="ifReserve != null "> and ac.if_reserve = #{ifReserve}</if>
+            <if test="ifEnablePayCode != null "> and ac.if_enable_pay_code = #{ifEnablePayCode}</if>
+            <if test="payCodeUrl != null  and payCodeUrl != ''"> and ac.pay_code_url = #{payCodeUrl}</if>
         </where>
     </select>
     
     <select id="selectAllocCanteenByCanteenId" parameterType="Long" resultMap="AllocCanteenResult">
         <include refid="selectAllocCanteenVo"/>
-        where canteen_id = #{canteenId}
+        where ac.canteen_id = #{canteenId}
     </select>
         
     <insert id="insertAllocCanteen" parameterType="com.bonus.canteen.core.alloc.domain.AllocCanteen" useGeneratedKeys="true" keyProperty="canteenId">
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocStallMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocStallMapper.xml
index 542fd6a..dba8e1b 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocStallMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocStallMapper.xml
@@ -35,40 +35,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAllocStallVo">
-        select stall_id, stall_name, area_id, canteen_id, stall_type, third_stall_id, director, contact_tel, main_project, business_state, start_business_time, end_business_time, if_use_call_num, on_line_meal_code_prefix, off_line_meal_code_prefix, if_enable_delivery, deliveries, if_enable_order, img_url, if_book, if_reserve, if_enable_pay_code, pay_code_url, del_flag, create_by, create_time, update_by, update_time from alloc_stall
+        select ast.stall_id, ast.stall_name, ast.area_id, ast.canteen_id, ac.canteen_name, aa.area_name,
+               ast.stall_type, ast.third_stall_id, ast.director, ast.contact_tel,
+               ast.main_project, ast.business_state, ast.start_business_time, ast.end_business_time, ast.if_use_call_num,
+               ast.on_line_meal_code_prefix, ast.off_line_meal_code_prefix, ast.if_enable_delivery, ast.deliveries,
+               ast.if_enable_order, ast.img_url, ast.if_book, ast.if_reserve, ast.if_enable_pay_code, ast.pay_code_url,
+               ast.del_flag, ast.create_by, ast.create_time, ast.update_by, ast.update_time
+        from alloc_stall ast
+             left join alloc_canteen ac on ast.canteen_id = ac.canteen_id
+             left join alloc_area aa on ac.area_id = aa.area_id
     </sql>
 
     <select id="selectAllocStallList" parameterType="com.bonus.canteen.core.alloc.domain.AllocStall" resultMap="AllocStallResult">
         <include refid="selectAllocStallVo"/>
         <where>  
-            <if test="stallName != null  and stallName != ''"> and stall_name like concat('%', #{stallName}, '%')</if>
-            <if test="areaId != null "> and area_id = #{areaId}</if>
-            <if test="canteenId != null "> and canteen_id = #{canteenId}</if>
-            <if test="stallType != null "> and stall_type = #{stallType}</if>
-            <if test="thirdStallId != null  and thirdStallId != ''"> and third_stall_id = #{thirdStallId}</if>
-            <if test="director != null "> and director = #{director}</if>
-            <if test="contactTel != null  and contactTel != ''"> and contact_tel = #{contactTel}</if>
-            <if test="mainProject != null  and mainProject != ''"> and main_project = #{mainProject}</if>
-            <if test="businessState != null "> and business_state = #{businessState}</if>
-            <if test="startBusinessTime != null "> and start_business_time = #{startBusinessTime}</if>
-            <if test="endBusinessTime != null "> and end_business_time = #{endBusinessTime}</if>
-            <if test="ifUseCallNum != null "> and if_use_call_num = #{ifUseCallNum}</if>
-            <if test="onLineMealCodePrefix != null  and onLineMealCodePrefix != ''"> and on_line_meal_code_prefix = #{onLineMealCodePrefix}</if>
-            <if test="offLineMealCodePrefix != null  and offLineMealCodePrefix != ''"> and off_line_meal_code_prefix = #{offLineMealCodePrefix}</if>
-            <if test="ifEnableDelivery != null "> and if_enable_delivery = #{ifEnableDelivery}</if>
-            <if test="deliveries != null  and deliveries != ''"> and deliveries = #{deliveries}</if>
-            <if test="ifEnableOrder != null "> and if_enable_order = #{ifEnableOrder}</if>
-            <if test="imgUrl != null  and imgUrl != ''"> and img_url = #{imgUrl}</if>
-            <if test="ifBook != null "> and if_book = #{ifBook}</if>
-            <if test="ifReserve != null "> and if_reserve = #{ifReserve}</if>
-            <if test="ifEnablePayCode != null "> and if_enable_pay_code = #{ifEnablePayCode}</if>
-            <if test="payCodeUrl != null  and payCodeUrl != ''"> and pay_code_url = #{payCodeUrl}</if>
+            <if test="stallName != null  and stallName != ''"> and ast.stall_name like concat('%', #{stallName}, '%')</if>
+            <if test="areaId != null "> and ast.area_id = #{areaId}</if>
+            <if test="canteenId != null "> and ast.canteen_id = #{canteenId}</if>
+            <if test="stallType != null "> and ast.stall_type = #{stallType}</if>
+            <if test="thirdStallId != null  and thirdStallId != ''"> and ast.third_stall_id = #{thirdStallId}</if>
+            <if test="director != null "> and ast.director = #{director}</if>
+            <if test="contactTel != null  and contactTel != ''"> and ast.contact_tel = #{contactTel}</if>
+            <if test="mainProject != null  and mainProject != ''"> and ast.main_project = #{mainProject}</if>
+            <if test="businessState != null "> and ast.business_state = #{businessState}</if>
+            <if test="startBusinessTime != null "> and ast.start_business_time = #{startBusinessTime}</if>
+            <if test="endBusinessTime != null "> and ast.end_business_time = #{endBusinessTime}</if>
+            <if test="ifUseCallNum != null "> and ast.if_use_call_num = #{ifUseCallNum}</if>
+            <if test="onLineMealCodePrefix != null  and onLineMealCodePrefix != ''"> and ast.on_line_meal_code_prefix = #{onLineMealCodePrefix}</if>
+            <if test="offLineMealCodePrefix != null  and offLineMealCodePrefix != ''"> and ast.off_line_meal_code_prefix = #{offLineMealCodePrefix}</if>
+            <if test="ifEnableDelivery != null "> and ast.if_enable_delivery = #{ifEnableDelivery}</if>
+            <if test="deliveries != null  and deliveries != ''"> and ast.deliveries = #{deliveries}</if>
+            <if test="ifEnableOrder != null "> and ast.if_enable_order = #{ifEnableOrder}</if>
+            <if test="imgUrl != null  and imgUrl != ''"> and ast.img_url = #{imgUrl}</if>
+            <if test="ifBook != null "> and ast.if_book = #{ifBook}</if>
+            <if test="ifReserve != null "> and ast.if_reserve = #{ifReserve}</if>
+            <if test="ifEnablePayCode != null "> and ast.if_enable_pay_code = #{ifEnablePayCode}</if>
+            <if test="payCodeUrl != null  and payCodeUrl != ''"> and ast.pay_code_url = #{payCodeUrl}</if>
         </where>
     </select>
     
     <select id="selectAllocStallByStallId" parameterType="Long" resultMap="AllocStallResult">
         <include refid="selectAllocStallVo"/>
-        where stall_id = #{stallId}
+        where ast.stall_id = #{stallId}
     </select>
         
     <insert id="insertAllocStall" parameterType="com.bonus.canteen.core.alloc.domain.AllocStall" useGeneratedKeys="true" keyProperty="stallId">