From 3c34fdfb87e596ae05b15e04ed298198678ee050 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Wed, 28 May 2025 17:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=A0=82-=E8=AE=BE=E5=A4=87=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DataScreening/DataScreeningMapper.xml          | 8 ++++----
 .../src/main/resources/mapper/device/DeviceInfoMapper.xml | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/DataScreening/DataScreeningMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/DataScreening/DataScreeningMapper.xml
index 9a66669..4235331 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/DataScreening/DataScreeningMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/DataScreening/DataScreeningMapper.xml
@@ -55,9 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDish" resultType="com.bonus.canteen.core.dataScreening.vo.SingleModelVO">
         select
             count( DISTINCT mrd2.dishes_id ) AS num
-        from menu_recipe_detail mrd
-        left join menu_recipe_dishes mrd2 on mrd.detail_id = mrd2.detail_id
-        where mrd.apply_date = #{date} and mrd.detail_type = '2' and mrd.del_flag = '2'
+        from cook_recipe_detail mrd
+        left join cook_recipe_dishes mrd2 on mrd.recipe_detail_id = mrd2.recipe_detail_id
+        where mrd.apply_date = #{date} and mrd.detail_type = '2'
     </select>
     <select id="getCanteenOrdersAndSalesTrends" resultType="com.bonus.canteen.core.dataScreening.vo.EchartsVO">
         SELECT
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             order_detail od
                 left join order_info oi on oi.order_id = od.order_id
-                left join menu_dishes md on md.dishes_id = od.goods_id
+                left join cook_dishes md on md.dishes_id = od.goods_id
         WHERE
             oi.order_date between #{startDate} and #{endDate} and md.dishes_name is not null
         group by od.goods_id
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DeviceInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DeviceInfoMapper.xml
index 2ab04e0..3911231 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DeviceInfoMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DeviceInfoMapper.xml
@@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDeviceInfoList" parameterType="com.bonus.canteen.core.device.domain.DeviceInfo" resultMap="DeviceInfoResult">
         <include refid="selectDeviceInfoVo"/>
         <where>
+            <if test="deviceType != null and deviceType != ''"> and di.device_type = #{deviceType}</if>
             <if test="areaId != null and areaId != ''"> and db.area_id = #{areaId}</if>
             <if test="canteenId != null and canteenId != ''"> and db.canteen_id = #{canteenId}</if>
             <if test="stallId != null and stallId != ''"> and db.stall_id = #{stallId}</if>