|
|
@@ -88,11 +88,14 @@
|
|
|
and (suho.linkman like concat('%',#{queryProperties},'%')
|
|
|
or suho.phone like concat('%',#{queryProperties},'%'))
|
|
|
</if>
|
|
|
- <if test="reportStatus != null and reportStatus != '' and reportStatus != 2 and reportStatus != 3">
|
|
|
- and msr.report_status=#{reportStatus}
|
|
|
+ <if test="reportStatus == 0">
|
|
|
+ and msr.report_status=0 and mss.temperature > 0
|
|
|
+ </if>
|
|
|
+ <if test="reportStatus == 1">
|
|
|
+ and msr.report_status=1
|
|
|
</if>
|
|
|
<if test="reportStatus == 2">
|
|
|
- and msr.report_status is null
|
|
|
+ and (msr.report_status is null or mss.temperature is null or mss.temperature = 0)
|
|
|
</if>
|
|
|
<if test="reportStatus == 3">
|
|
|
and (msr.report_status is null or msr.report_status=0)
|
