Merge branch 'dev'

1

pom.xml

@@ -43,7 +43,7 @@
         <gson.version>2.8.6</gson.version>
         <commons.version>3.10</commons.version>
         <jackson.version>2.11.0</jackson.version>
-        <ehcache.version>2.10.6</ehcache.version>
+<!--        <ehcache.version>2.10.6</ehcache.version>-->
         <swagger2-bootstrap.version>1.9.6</swagger2-bootstrap.version>
         <jetbrains.version>13.0</jetbrains.version>
         <tencentyun.version>1.1</tencentyun.version>
@@ -191,11 +191,11 @@
                 <version>${redis.version}</version>
             </dependency>
             <!-- ehcache 缓存 -->
-            <dependency>
-                <groupId>net.sf.ehcache</groupId>
-                <artifactId>ehcache</artifactId>
-                <version>${ehcache.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>net.sf.ehcache</groupId>-->
+<!--                <artifactId>ehcache</artifactId>-->
+<!--                <version>${ehcache.version}</version>-->
+<!--            </dependency>-->
             <!-- rocketmq -->
             <dependency>
                 <groupId>org.apache.rocketmq</groupId>

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java

@@ -454,11 +454,11 @@ public class TEExamStudentController {
         }
         InvigilateMonitorStatusEnum invigilateMonitorStatusEnum = examCacheBean.getMonitorStatus();//监考状态
         if (Objects.nonNull(invigilateMonitorStatusEnum) && !Objects.equals(invigilateMonitorStatusEnum, InvigilateMonitorStatusEnum.FINISHED)) {
-            throw new BusinessException("当前批次监考未结束，请在结束后查询");
+            throw new BusinessException("当前批次监考未结束，请在结束后操作");
         }
         ScoreStatusEnum scoreStatusEnum = examCacheBean.getScoreStatus();//算分状态
         if (Objects.nonNull(scoreStatusEnum) && (Objects.equals(scoreStatusEnum, ScoreStatusEnum.NEVER) || Objects.equals(scoreStatusEnum, ScoreStatusEnum.FINISH))) {
-            throw new BusinessException("当前批次算分未结束，请在结束后查询");
+            throw new BusinessException("当前批次算分未结束，请在结束后操作");
         }
         QueryWrapper<TEExamCourse> teExamCourseQueryWrapper = new QueryWrapper<>();
         teExamCourseQueryWrapper.lambda().eq(TEExamCourse::getExamId, examId);
@@ -474,7 +474,7 @@ public class TEExamStudentController {
             }).collect(Collectors.toSet());
         }
         if (Objects.nonNull(answerList) && answerList.size() > 0) {
-            throw new BusinessException("当前批次标答未补齐，请补齐后查询");
+            throw new BusinessException("当前批次标答未补齐，请补齐后操作");
         }
     }
 }

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

@@ -16,7 +16,9 @@
         left join t_b_exam_invigilate_user tbeiu on
             tbeiu.exam_id = tieic.exam_id
         and tbeiu.room_code = tees.room_code
-        <where>
+        left join t_oe_exam_record toer on
+            toer.id = tieic.exam_record_id
+        <where> 1 = 1
             <if test="examId != null and examId != ''">
                 and tieic.exam_id = #{examId}
             </if>
@@ -33,6 +35,7 @@
                 and tieic.call_status = #{callStatus}
             </if>
         </where>
+        and (toer.status <![CDATA[ <> ]]> 'FINISHED' and toer.status <![CDATA[ <> ]]> 'PERSISTED')
     </select>
 
     <select id="examInvigilateCallQueryCount" resultType="java.lang.Integer">