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

Compare commits

base: bonus:a768c9df40da104e8292bdc863a1597bb9d63d22
Branches Tags
bonus:master
bonus:test0606
bonus:testjob
bonus:removedishbase
bonus:order
bonus:test0530
bonus:rs0527
bonus:liuxin0527
bonus:liuxin0528
..
compare: bonus:5c975cd755a515e5e8079533ad5197a779ccabe0
Branches Tags
bonus:master
bonus:test0606
bonus:testjob
bonus:removedishbase
bonus:order
bonus:test0530
bonus:rs0527
bonus:liuxin0527
bonus:liuxin0528

No commits in common. "a768c9df40da104e8292bdc863a1597bb9d63d22" and "5c975cd755a515e5e8079533ad5197a779ccabe0" have entirely different histories.
a768c9df40 ... 5c975cd755

1 changed files with 0 additions and 12 deletions
Show Stats Expand all files Collapse all files

12
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml
View File

@ -57,18 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{deviceType} #{deviceType}
</foreach> </foreach>
</if> </if>
<if test="envSensorResultTypeList == null or envSensorResultTypeList.size() == 0">
AND !((kdsm.measure_code = 'temperature'
and kdsm.measure_type = 1
and kdsr.measure_data between kdsm.measure_min_value and kdsm.measure_max_value)
or (kdsm.measure_code = 'humidity'
and kdsm.measure_type = 1
and kdsr.measure_data between kdsm.measure_min_value and kdsm.measure_max_value)
or (kdsm.measure_code = 'smoke'
and kdsm.measure_type = 1
and kdsr.measure_data <![CDATA[ <= ]]> kdsm.measure_max_value)
)
</if>
<if test="envSensorResultTypeList != null and envSensorResultTypeList.size() > 0"> <if test="envSensorResultTypeList != null and envSensorResultTypeList.size() > 0">
and ( and (
<foreach item="type" collection="envSensorResultTypeList" separator=" or "> <foreach item="type" collection="envSensorResultTypeList" separator=" or ">