|
@@ -201,18 +201,6 @@
|
|
<if test="minWarningCount != null and minWarningCount != '' or minWarningCount == 0">
|
|
<if test="minWarningCount != null and minWarningCount != '' or minWarningCount == 0">
|
|
and t.warning_count >= #{minWarningCount}
|
|
and t.warning_count >= #{minWarningCount}
|
|
</if>
|
|
</if>
|
|
- <if test="minExceptionCount != null and minExceptionCount != '' or minExceptionCount == 0">
|
|
|
|
- and t.exceptionCount >= #{minExceptionCount}
|
|
|
|
- </if>
|
|
|
|
- <if test="maxExceptionCount != null and maxExceptionCount != '' or maxExceptionCount == 0">
|
|
|
|
- and t.exceptionCount <= #{maxExceptionCount}
|
|
|
|
- </if>
|
|
|
|
- <if test="minMultipleFaceCount != null and minMultipleFaceCount != '' or minMultipleFaceCount == 0">
|
|
|
|
- and t.multipleFaceCount >= #{minMultipleFaceCount}
|
|
|
|
- </if>
|
|
|
|
- <if test="maxMultipleFaceCount != null and maxMultipleFaceCount != '' or maxMultipleFaceCount == 0">
|
|
|
|
- and t.multipleFaceCount <= #{maxMultipleFaceCount}
|
|
|
|
- </if>
|
|
|
|
</where>
|
|
</where>
|
|
</sql>
|
|
</sql>
|
|
|
|
|
|
@@ -600,6 +588,20 @@
|
|
</if>
|
|
</if>
|
|
) t,
|
|
) t,
|
|
(SELECT @i := 0) as i
|
|
(SELECT @i := 0) as i
|
|
|
|
+ <where>
|
|
|
|
+ <if test="minMultipleFaceCount != null and minMultipleFaceCount != '' or minMultipleFaceCount == 0">
|
|
|
|
+ and t.multipleFaceCount >= #{minMultipleFaceCount}
|
|
|
|
+ </if>
|
|
|
|
+ <if test="maxMultipleFaceCount != null and maxMultipleFaceCount != '' or maxMultipleFaceCount == 0">
|
|
|
|
+ and t.multipleFaceCount <= #{maxMultipleFaceCount}
|
|
|
|
+ </if>
|
|
|
|
+ <if test="minExceptionCount != null and minExceptionCount != '' or minExceptionCount == 0">
|
|
|
|
+ and t.exceptionCount >= #{minExceptionCount}
|
|
|
|
+ </if>
|
|
|
|
+ <if test="maxExceptionCount != null and maxExceptionCount != '' or maxExceptionCount == 0">
|
|
|
|
+ and t.exceptionCount <= #{maxExceptionCount}
|
|
|
|
+ </if>
|
|
|
|
+ </where>
|
|
order by t.roomCode
|
|
order by t.roomCode
|
|
</select>
|
|
</select>
|
|
|
|
|