fix bug

themis-business/src/main/java/com/qmth/themis/business/dao/TEExamMapper.java

@@ -45,13 +45,6 @@ public interface TEExamMapper extends BaseMapper<TEExam> {
      */
     public List<TEExamDto> getWaitingExam(@Param("studentId") Long studentId, @Param("examId") Long examId, @Param("orgId") Long orgId);
 
-//    /**
-//     * 获取考试待考列表
-//     *
-//     * @return
-//     */
-//    public List<Map> getWaitingExamForJob();
-
     /**
      * 监考端获取考试批次列表
      *

themis-business/src/main/java/com/qmth/themis/business/service/TEExamService.java

@@ -47,13 +47,6 @@ public interface TEExamService extends IService<TEExam> {
      */
     public List<TEExamDto> getWaitingExam(Long studentId, Long examId, Long orgId);
 
-//    /**
-//     * 获取考试待考列表
-//     *
-//     * @return
-//     */
-//    public List<Map> getWaitingExamForJob();
-
     /**
      * 开始候考
      *

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java

@@ -158,16 +158,6 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
         return list;
     }
 
-//    /**
-//     * 获取考试待考列表
-//     *
-//     * @return
-//     */
-//    @Override
-//    public List<Map> getWaitingExamForJob() {
-//        return teExamMapper.getWaitingExamForJob();
-//    }
-
     /**
      * 开始候考
      */

themis-business/src/main/resources/db/init.sql

@@ -715,6 +715,7 @@ INSERT INTO `t_b_role_privilege` VALUES (168, 'INSPECTION', 144);
 INSERT INTO `t_b_role_privilege` VALUES (169, 'ADMIN', 145);
 INSERT INTO `t_b_role_privilege` VALUES (170, 'INVIGILATE', 145);
 INSERT INTO `t_b_role_privilege` VALUES (171, 'INSPECTION', 145);
+INSERT INTO `t_b_role_privilege` VALUES (172, 'INVIGILATE', 107);
 COMMIT;
 
 -- ----------------------------

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

@@ -117,7 +117,7 @@
             teea.code,
             tees.id as examStudentId,
             tees.course_code as courseCode,
-            teec.course_name as courseName,
+            tees.course_name as courseName,
             tee.opening_seconds as openingSeconds,
             teea.opening_seconds as activityOpeningSeconds,
             UNIX_TIMESTAMP(date_sub(teea.start_time, interval IFNULL(teea.prepare_seconds, tee.prepare_seconds) second)) * 1000 as prepareTime,
@@ -146,8 +146,6 @@
             tee.id as examId
         from
             t_e_exam_student tees
-        left join t_e_exam_course teec on
-            teec.course_code = tees.course_code
         left join t_e_exam tee on
             tee.id = tees.exam_id
         left join t_e_exam_activity teea on

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

@@ -105,8 +105,6 @@
             preNoticeStaySeconds, tee.post_notice as postNotice, datediff(now(), teea.start_time) as reallyTime
         from
         t_e_exam_student tees
-        left join t_e_exam_course teec on
-        teec.course_code = tees.course_code
         left join t_e_exam tee on
         tee.id = tees.exam_id
         left join t_e_exam_activity teea on
@@ -133,56 +131,6 @@
         </where>
     </select>
 
-<!--    <select id="getWaitingExamForJob" resultType="java.util.Map">-->
-<!--        select-->
-<!--            teea.id,-->
-<!--            teea.code,-->
-<!--            tee.opening_seconds as openingSeconds,-->
-<!--            tee.prepare_seconds as prepareSeconds,-->
-<!--            tee.min_duration_seconds as minDurationSeconds,-->
-<!--            tee.max_duration_seconds as maxDurationSeconds,-->
-<!--            tee.exam_count as examCount,-->
-<!--            tee.force_finish as forceFinish,-->
-<!--            tee.entry_authentication_policy as entryAuthenticationPolicy,-->
-<!--            tee.in_process_face_verify as inProcessFaceVerify,-->
-<!--            tee.in_process_face_stranger_ignore as inProcessFaceStrangerIgnore,-->
-<!--            tee.in_process_liveness_verify as inProcessLivenessVerify,-->
-<!--            tee.in_process_liveness_fixed_range as inProcessLivenessFixedRange,-->
-<!--            tee.in_process_liveness_judge_policy as inProcessLivenessJudgePolicy,-->
-<!--            tee.camera_photo_upload as cameraPhotoUpload,-->
-<!--            teea.id as activityId,-->
-<!--            teea.code as activityCode,-->
-<!--            teea.opening_seconds as activityOpeningSeconds,-->
-<!--            teea.prepare_seconds as activityPrepareSeconds,-->
-<!--            teea.max_duration_seconds as activityMaxDurationSeconds,-->
-<!--            teea.start_time as startTime,-->
-<!--            teea.finish_time as finishTime-->
-<!--        from-->
-<!--            t_e_exam_activity teea-->
-<!--        left join (-->
-<!--            select-->
-<!--                distinct tee.id, teea.id as examActivityId, tee.name, tee.mode, tee.pre_notice as preNotice, tee.pre_notice_stay_seconds as preNoticeStaySeconds, tee.post_notice as postNotice, datediff(now(), teea.start_time) as reallyTime-->
-<!--            from-->
-<!--                t_e_exam_student tees-->
-<!--            left join t_e_exam_course teec on-->
-<!--                teec.course_code = tees.course_code-->
-<!--            left join t_e_exam tee on-->
-<!--                tee.id = tees.exam_id-->
-<!--            left join t_e_exam_activity teea on-->
-<!--                teea.id = tees.exam_activity_id-->
-<!--            WHERE-->
-<!--                tee.enable = 1-->
-<!--                and teea.enable = 1-->
-<!--                and tees.enable = 1-->
-<!--                and teea.start_time >= date_add(now(), interval IFNULL(teea.opening_seconds, tee.opening_seconds) second) ) t on-->
-<!--            t.examActivityId = teea.id-->
-<!--        left join t_e_exam tee on-->
-<!--            tee.id = t.id-->
-<!--        WHERE-->
-<!--            t.reallyTime = -1-->
-<!--            or t.reallyTime = 0-->
-<!--    </select>-->
-
     <select id="examPrivilegeQuery" resultType="com.qmth.themis.business.entity.TEExam">
         select
             *