Browse Source

在线考试2022/05/20临时上线需求更改,缺考修改

wangliang 3 years ago
parent
commit
cd2cffef44

+ 3 - 5
themis-business/src/main/resources/mapper/TEExamStudentMapper.xml

@@ -361,9 +361,7 @@
         <if test="name != null and name != ''">
         <if test="name != null and name != ''">
             and t.name like concat('%',#{name},'%')
             and t.name like concat('%',#{name},'%')
         </if>
         </if>
-        and toer.status = 'FIRST_PREPARE'
-        and (toer.first_start_time is null
-        or toer.first_prepare_time is null)
+        and (toer.first_start_time is null or toer.first_prepare_time is null)
         and not exists(
         and not exists(
         select
         select
         *
         *
@@ -377,8 +375,8 @@
         t.exam_student_id = s.id
         t.exam_student_id = s.id
         where
         where
         t.exam_id = #{examId}
         t.exam_id = #{examId}
-        and (t.STATUS = 'FINISHED'
-        or t.STATUS = 'PERSISTED')
+        and (t.STATUS = 'FINISHED' or t.STATUS = 'PERSISTED')
+        and t.first_start_time is not null
         and t.exam_activity_id in
         and t.exam_activity_id in
         <foreach collection="activityIds" item="acid" index="index"
         <foreach collection="activityIds" item="acid" index="index"
                  open="(" close=")" separator=",">
                  open="(" close=")" separator=",">

+ 3 - 5
themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -1382,9 +1382,7 @@
         <foreach collection="roomCodeSet" item="roomCode" index="index" open="(" close=")" separator=",">
         <foreach collection="roomCodeSet" item="roomCode" index="index" open="(" close=")" separator=",">
             #{roomCode}
             #{roomCode}
         </foreach>
         </foreach>
-        and toer.status = 'FIRST_PREPARE'
-        and (toer.first_start_time is null
-        or toer.first_prepare_time is null)
+        and (toer.first_start_time is null or toer.first_prepare_time is null)
         and not exists(
         and not exists(
         select
         select
         *
         *
@@ -1398,8 +1396,8 @@
         t.exam_student_id = s.id
         t.exam_student_id = s.id
         where
         where
         t.exam_id = #{examId}
         t.exam_id = #{examId}
-        and (t.STATUS = 'FINISHED'
-        or t.STATUS = 'PERSISTED')
+        and (t.STATUS = 'FINISHED' or t.STATUS = 'PERSISTED')
+        and t.first_start_time is not null
         and s.room_code in
         and s.room_code in
         <foreach collection="roomCodeSet" item="roomCode" index="index" open="(" close=")" separator=",">
         <foreach collection="roomCodeSet" item="roomCode" index="index" open="(" close=")" separator=",">
             #{roomCode}
             #{roomCode}