Compare commits

..

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

1 changed files with 0 additions and 12 deletions

View File

@ -57,18 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{deviceType}
</foreach>
</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">
and (
<foreach item="type" collection="envSensorResultTypeList" separator=" or ">