|
@@ -565,7 +565,7 @@
|
|
|
|
|
|
<select id="invigilatePageListHistory" resultType="com.qmth.themis.business.bean.admin.InvigilateListHistoryBean">
|
|
<select id="invigilatePageListHistory" resultType="com.qmth.themis.business.bean.admin.InvigilateListHistoryBean">
|
|
<include refid="invigilatePageListHistorySql"/>
|
|
<include refid="invigilatePageListHistorySql"/>
|
|
- order by CAST(t.examActivityCode AS UNSIGNED),CAST(t.roomCode AS UNSIGNED)
|
|
|
|
|
|
+ order by CAST(teea.code AS UNSIGNED),CAST(s.room_code AS UNSIGNED)
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<sql id="invigilatePageListHistorySql">
|
|
<sql id="invigilatePageListHistorySql">
|
|
@@ -698,7 +698,7 @@
|
|
<select id="invigilatePageListHistoryExport"
|
|
<select id="invigilatePageListHistoryExport"
|
|
resultType="com.qmth.themis.business.bean.admin.InvigilateListHistoryBean">
|
|
resultType="com.qmth.themis.business.bean.admin.InvigilateListHistoryBean">
|
|
<include refid="invigilatePageListHistorySql"/>
|
|
<include refid="invigilatePageListHistorySql"/>
|
|
- order by CAST(t.examActivityCode AS UNSIGNED),CAST(t.roomCode AS UNSIGNED)
|
|
|
|
|
|
+ order by CAST(teea.code AS UNSIGNED),CAST(s.room_code AS UNSIGNED)
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getDoneCountByDay" resultType="java.util.Map">
|
|
<select id="getDoneCountByDay" resultType="java.util.Map">
|