Merge branch 'dev_v1.2.8' into dev_v1.2.9

imergie

themis-business/src/main/resources/db/log/1.2.8.log

@@ -77,6 +77,7 @@ CREATE TABLE `t_e_exam_summary` (
   `monitor_stop_count` int DEFAULT NULL COMMENT '监控停止人数',
   `warning_count` int DEFAULT NULL COMMENT '预警总数',
   `warning_unread` int DEFAULT NULL COMMENT '预警未读数',
+  `warning_student_unread` int DEFAULT NULL COMMENT '预警考生未读数（去重）',
   `warning_multiple_face_count` int DEFAULT NULL COMMENT '陌生人脸预警总数',
   `exception_count` int DEFAULT NULL COMMENT '异常数据总数',
   PRIMARY KEY (`id`),
@@ -140,6 +141,4 @@ INSERT INTO t_b_role_privilege
 VALUES(153, 'ADMIN', 19);
 
 delete t from t_b_role_privilege t
-where t.id in (149,153);
-
-ALTER TABLE t_e_exam_summary ADD warning_student_unread BIGINT NULL COMMENT '预警考生未读数（去重）';
+where t.id in (149,153);

themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -480,7 +480,9 @@
             </if>
             and tee.monitor_status <![CDATA[ <> ]]> 'FINISHED'
         </where>
-        order by CAST(teea.code AS UNSIGNED),CAST(tees.room_code AS UNSIGNED)
+        <if test="(examActivityId != null and examActivityId != '') or (roomCode != null and roomCode != '')">
+            order by CAST(teea.code AS UNSIGNED),CAST(tees.room_code AS UNSIGNED)
+        </if>
     </select>
 
     <select id="invigilatePageProgressListExport"
@@ -559,12 +561,16 @@
             </if>
             and tee.monitor_status <![CDATA[ <> ]]> 'FINISHED'
         </where>
-        order by CAST(teea.code AS UNSIGNED),CAST(tees.room_code AS UNSIGNED)
+        <if test="(examActivityId != null and examActivityId != '') or (roomCode != null and roomCode != '')">
+            order by CAST(teea.code AS UNSIGNED),CAST(tees.room_code AS UNSIGNED)
+        </if>
     </select>
 
     <select id="invigilatePageListHistory" resultType="com.qmth.themis.business.bean.admin.InvigilateListHistoryBean">
         <include refid="invigilatePageListHistorySql"/>
-        order by CAST(teea.code AS UNSIGNED),CAST(s.room_code AS UNSIGNED)
+        <if test="(examActivityId != null and examActivityId != '') or (roomCode != null and roomCode != '')">
+            order by CAST(teea.code AS UNSIGNED),CAST(s.room_code AS UNSIGNED)
+        </if>
     </select>
 
     <sql id="invigilatePageListHistorySql">
@@ -697,7 +703,9 @@
     <select id="invigilatePageListHistoryExport"
             resultType="com.qmth.themis.business.bean.admin.InvigilateListHistoryBean">
         <include refid="invigilatePageListHistorySql"/>
-        order by CAST(teea.code AS UNSIGNED),CAST(s.room_code AS UNSIGNED)
+        <if test="(examActivityId != null and examActivityId != '') or (roomCode != null and roomCode != '')">
+            order by CAST(teea.code AS UNSIGNED),CAST(s.room_code AS UNSIGNED)
+        </if>
     </select>
 
     <select id="getDoneCountByDay" resultType="java.util.Map">
@@ -1290,7 +1298,9 @@
                 and tees.identity like CONCAT('%', #{identity},'%')
             </if>
         </where>
-        order by CAST(teea.code AS UNSIGNED),CAST(tees.room_code AS UNSIGNED)
+        <if test="(examActivityId != null and examActivityId != '') or (roomCode != null and roomCode != '')">
+            order by CAST(teea.code AS UNSIGNED),CAST(tees.room_code AS UNSIGNED)
+        </if>
     </select>
 
     <select id="examRecordDetailListQuery" resultType="java.lang.String">