Merge branch 'dev'

1

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

@@ -774,7 +774,7 @@
 			and s.enable = 1
 			and tee.enable = 1
 			and teea.enable = 1
-			and teea.finish_time > unix_timestamp(current_timestamp()) * 1000
+			and (t.status <![CDATA[ <> ]]> 'PERSISTED' and t.status <![CDATA[ <> ]]> 'FINISHED')
 		</where> ) t
 		group by
 		t.roomCode,