Ver código fonte

监考批次优化

wangliang 1 ano atrás
pai
commit
ca2350841c

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

@@ -57,16 +57,16 @@
         order by
         order by
         tbth.create_time desc
         tbth.create_time desc
         limit 1) as cloudMarkPushDataStatus
         limit 1) as cloudMarkPushDataStatus
-        <if test="type != null and type != '' and type == 'monitor'">
+        <!--<if test="type != null and type != '' and type == 'monitor'">
             ,group_concat(distinct tees.room_code) as roomCode,
             ,group_concat(distinct tees.room_code) as roomCode,
             group_concat(distinct tees.room_name) as roomName
             group_concat(distinct tees.room_name) as roomName
-        </if>
+        </if>-->
         from t_e_exam t
         from t_e_exam t
         left join t_b_user tbu1 on t.create_id = tbu1.id
         left join t_b_user tbu1 on t.create_id = tbu1.id
         left join t_b_user tbu2 on t.update_id = tbu2.id
         left join t_b_user tbu2 on t.update_id = tbu2.id
-        <if test="type != null and type != '' and type == 'monitor'">
+        <!--<if test="type != null and type != '' and type == 'monitor'">
             left join t_e_exam_student tees on tees.exam_id = t.id
             left join t_e_exam_student tees on tees.exam_id = t.id
-        </if>
+        </if>-->
         <if test="userId != null and userId != ''">
         <if test="userId != null and userId != ''">
             left join t_b_exam_invigilate_user tbeiu on tbeiu.exam_id = t.id
             left join t_b_exam_invigilate_user tbeiu on tbeiu.exam_id = t.id
         </if>
         </if>
@@ -100,7 +100,7 @@
                 and t.enable = #{enable}
                 and t.enable = #{enable}
             </if>
             </if>
         </where>
         </where>
-        <if test="type != null and type != '' and type == 'monitor'">
+        <!--<if test="type != null and type != '' and type == 'monitor'">
             group by t.id,
             group by t.id,
             t.code,
             t.code,
             t.name,
             t.name,
@@ -116,7 +116,7 @@
             t.monitor_video_source,
             t.monitor_video_source,
             t.monitor_record,
             t.monitor_record,
             t.monitor_status
             t.monitor_status
-        </if>
+        </if>-->
         order by t.create_time desc
         order by t.create_time desc
     </select>
     </select>
 
 

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

@@ -297,7 +297,7 @@
         <where> 1 = 1
         <where> 1 = 1
             and tee.monitor_status <![CDATA[ <> ]]> 'FINISHED'
             and tee.monitor_status <![CDATA[ <> ]]> 'FINISHED'
             <if test="examId != null and examId != ''">
             <if test="examId != null and examId != ''">
-                and tiiwi.exam_id = #{examId}
+                and toer.exam_id = #{examId}
             </if>
             </if>
             <if test="userId != null and userId != ''">
             <if test="userId != null and userId != ''">
                 and tbeiu.user_id = #{userId}
                 and tbeiu.user_id = #{userId}
@@ -306,7 +306,7 @@
                 and tee.org_id = #{orgId}
                 and tee.org_id = #{orgId}
             </if>
             </if>
             <if test="examActivityId != null and examActivityId != ''">
             <if test="examActivityId != null and examActivityId != ''">
-                and tiiwi.exam_activity_id = #{examActivityId}
+                and toer.exam_activity_id = #{examActivityId}
             </if>
             </if>
             <if test="roomCode != null and roomCode != ''">
             <if test="roomCode != null and roomCode != ''">
                 and tees.room_code = #{roomCode}
                 and tees.room_code = #{roomCode}