Merge branch 'dev'

1

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

@@ -72,7 +72,7 @@
         where
         t1.id = t.update_id) as updateName
         from t_e_exam t
-        <where> t.monitor_status !='FINISHED'
+        <where> t.monitor_status <![CDATA[ <> ]]> 'FINISHED'
             <if test="userId != null and userId != ''">
                 and t.start_time <![CDATA[ <= ]]> unix_timestamp(current_timestamp()) * 1000
                 and t.end_time <![CDATA[ >= ]]> unix_timestamp(current_timestamp()) * 1000

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

@@ -14,7 +14,7 @@
             tees.course_name as courseName,
             tees.exam_id as examId,
             tee.exam_count - tees.already_exam_count as examCount,
-            (select count(1) from t_oe_exam_record toer where toer.status <![CDATA[ <> ]]> 'FINISHED') as statusCount
+            (select count(1) from t_oe_exam_record toer where (toer.status <![CDATA[ <> ]]> 'FINISHED' and toer.status <![CDATA[ <> ]]> 'PERSISTED')) as statusCount
         from
             t_e_exam_student tees
             left join t_e_exam tee on