|
@@ -148,10 +148,10 @@
|
|
|
<if test="identity != null and identity !=''">
|
|
|
and s.identity like CONCAT('%', #{identity},'%')
|
|
|
</if>
|
|
|
- <if test="maxWarningCount != null and maxWarningCount != ''">
|
|
|
+ <if test="maxWarningCount != null and maxWarningCount != '' or maxWarningCount == 0">
|
|
|
and t.warning_count <= #{maxWarningCount}
|
|
|
</if>
|
|
|
- <if test="minWarningCount != null and minWarningCount != ''">
|
|
|
+ <if test="minWarningCount != null and minWarningCount != '' or minWarningCount == 0">
|
|
|
and t.warning_count >= #{minWarningCount}
|
|
|
</if>
|
|
|
<if
|
|
@@ -181,7 +181,7 @@
|
|
|
,date_format(date_sub(from_unixtime(IFNULL(teea.max_duration_seconds, tee.max_duration_seconds) - t.duration_seconds),INTERVAL 8 HOUR), '%H:%i:%s') as remainTime
|
|
|
<include refid="invigilatePageMiddle"/>
|
|
|
<include refid="invigilatePageFoot"/>
|
|
|
- <if test="paperDownload != null and paperDownload != ''">
|
|
|
+ <if test="paperDownload != null and paperDownload != '' or paperDownload == 0">
|
|
|
and t.paper_download = #{paperDownload}
|
|
|
</if>
|
|
|
<if test="status == null or status == ''">
|
|
@@ -204,7 +204,7 @@
|
|
|
,date_format(date_sub(from_unixtime(IFNULL(teea.max_duration_seconds, tee.max_duration_seconds) - t.duration_seconds),INTERVAL 8 HOUR), '%H:%i:%s') as remainTime
|
|
|
<include refid="invigilatePageMiddle" />
|
|
|
<include refid="invigilatePageFoot" />
|
|
|
- <if test="paperDownload != null and paperDownload != ''">
|
|
|
+ <if test="paperDownload != null and paperDownload != '' or paperDownload == 0">
|
|
|
and t.paper_download = #{paperDownload}
|
|
|
</if>
|
|
|
<if test="status == null or status == ''">
|
|
@@ -317,10 +317,10 @@
|
|
|
<if test="identity != null and identity !=''">
|
|
|
and tees.identity like CONCAT('%', #{identity},'%')
|
|
|
</if>
|
|
|
- <if test="maxWarningCount != null and maxWarningCount != ''">
|
|
|
+ <if test="maxWarningCount != null and maxWarningCount != '' or maxWarningCount == 0">
|
|
|
and toer.warning_count <= #{maxWarningCount}
|
|
|
</if>
|
|
|
- <if test="minWarningCount != null and minWarningCount != ''">
|
|
|
+ <if test="minWarningCount != null and minWarningCount != '' or minWarningCount == 0">
|
|
|
and toer.warning_count >= #{minWarningCount}
|
|
|
</if>
|
|
|
<if
|