bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

食堂-设备接口修改

This commit is contained in:
jjLv 2025-05-28 17:32:24 +08:00
parent 7130c44c64
commit 3c34fdfb87
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/DataScreening/DataScreeningMapper.xml
View File

@ -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

1
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DeviceInfoMapper.xml
View File

@ -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>