ソースを参照

视频通话记录增加轨迹

wangliang 1 年間 前
コミット
175051fbe3

+ 7 - 0
themis-business/src/main/resources/db/log/1.2.8.log

@@ -25,6 +25,13 @@ INSERT INTO t_b_role_privilege
 (id, role_code, privilege_id)
 VALUES(258, 'ADMIN', 208);
 
+ALTER TABLE t_ie_exam_invigilate_call ADD form_user_id BIGINT NULL COMMENT '发起人id';
+ALTER TABLE t_ie_exam_invigilate_call ADD receive_user_id BIGINT NULL COMMENT '接收人id';
+ALTER TABLE t_ie_exam_invigilate_call_log ADD form_user_id BIGINT NULL COMMENT '发起人id';
+ALTER TABLE t_ie_exam_invigilate_call_log ADD receive_user_id BIGINT NULL COMMENT '接收人id';
+ALTER TABLE t_ie_exam_invigilate_call_log ADD start_time BIGINT NULL COMMENT '开始通话时间';
+ALTER TABLE t_ie_exam_invigilate_call_log ADD end_time BIGINT NULL COMMENT '结束通话时间';
+
 /*删除进度查询菜单*/
 INSERT INTO t_b_role_privilege
 (id, role_code, privilege_id)

+ 9 - 18
themis-business/src/main/resources/mapper/TIeExamInvigilateCallMapper.xml

@@ -9,15 +9,10 @@
             tes.base_photo_path as basePhotoPath
         from
             t_ie_exam_invigilate_call tieic
-        left join t_e_exam_student tees on
-            tees.id = tieic.exam_student_id
-        left join t_e_student tes on
-            tes.id = tees.student_id
-        left join t_b_exam_invigilate_user tbeiu on
-            tbeiu.exam_id = tieic.exam_id
-        and tbeiu.room_code = tees.room_code
-        left join t_oe_exam_record toer on
-            toer.id = tieic.exam_record_id
+        left join t_e_exam_student tees on tees.id = tieic.exam_student_id
+        left join t_e_student tes on tes.id = tees.student_id
+        left join t_b_exam_invigilate_user tbeiu on tbeiu.exam_id = tieic.exam_id and tbeiu.room_code = tees.room_code
+        left join t_oe_exam_record toer on toer.id = tieic.exam_record_id
         <where> 1 = 1
             <if test="examId != null and examId != ''">
                 and tees.exam_id = #{examId}
@@ -52,24 +47,20 @@
         count(1)
         from
             t_ie_exam_invigilate_call tieic
-        left join t_e_exam_student tees on
-            tees.id = tieic.exam_student_id
-        left join t_e_student tes on
-            tes.id = tees.student_id
-        left join t_b_exam_invigilate_user tbeiu on
-            tbeiu.exam_id = tieic.exam_id
-        and tbeiu.room_code = tees.room_code
+        left join t_e_exam_student tees on tees.id = tieic.exam_student_id
+        left join t_e_student tes on tes.id = tees.student_id
+        left join t_b_exam_invigilate_user tbeiu on tbeiu.exam_id = tieic.exam_id and tbeiu.room_code = tees.room_code
         left join t_oe_exam_record toer on
         toer.id = tieic.exam_record_id
         <where>
             <if test="examId != null and examId != ''">
-                and tieic.exam_id = #{examId}
+                and tees.exam_id = #{examId}
             </if>
             <if test="userId != null and userId != ''">
                 and tbeiu.user_id = #{userId}
             </if>
             <if test="orgId != null and orgId != ''">
-                and tbeiu.org_id = #{orgId}
+                and tes.org_id = #{orgId}
             </if>
             <if test="status != null and status != ''">
                 and tieic.status = #{status}