Merge remote-tracking branch 'origin/master'

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/StudentExamResultDao.java

@@ -87,18 +87,4 @@ public interface StudentExamResultDao extends BaseDAO<Long, StudentExamResult> {
      * @param userId
      */
     StudentExamResult findByRoomIdAndUserId(@Param("roomId") String roomId, @Param("userId") String userId);
-
-    /**
-     * 修改学员SessionId
-     * @param examRegistrationId
-     * @param sessionId
-     */
-    void updateSessionId(@Param("examRegistrationId") Long examRegistrationId, @Param("sessionId") String sessionId);
-
-    /**
-     * 修改屏蔽用户
-     * @param examRegistrationId
-     * @param shieldUserId
-     */
-    void updateShield(@Param("examRegistrationId") Long examRegistrationId, @Param("shieldUserId") String shieldUserId);
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/StudentExamResultService.java

@@ -66,13 +66,6 @@ public interface StudentExamResultService extends BaseService<Long, StudentExamR
     void recordSync(RecordNotify recordNotify);
 
     /**
-     * 修改SessionId
-     * @param examRegistrationId
-     * @param sessionId
-     */
-    void updateSessionId(Long examRegistrationId, String sessionId);
-
-    /**
      * 屏蔽指定用户
      * @param roomId
      */

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/StudentExamResultServiceImpl.java

@@ -224,11 +224,6 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 	}
 
 	@Override
-	public void updateSessionId(Long examRegistrationId, String sessionId) {
-		studentExamResultDao.updateSessionId(examRegistrationId,sessionId);
-	}
-
-	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void shieldUserId(Long roomId,Integer shieldFlag) {
 		ExamRoom examRoom = examRoomService.get(roomId);

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamReviewMapper.xml

@@ -204,7 +204,7 @@
 				AND er.id_ IS NOT NULL
 			</if>
 			<if test="reviewFlag != null and reviewFlag == 0">
-				AND er.id_ IS NULL
+				AND er.id_ IS NULL AND ser.is_finished_exam_ IN (0,5)
 			</if>
 			<if test="roomId != 0">
 				AND ersr.exam_room_id_ = #{roomId}

edu-user/edu-user-biz/src/main/resources/config/mybatis/StudentExamResultMapper.xml

@@ -113,10 +113,6 @@
 		UPDATE student_exam_result SET is_finished_exam_ = #{finishedExam},update_time_ = NOW()
 		WHERE exam_registration_id_ = #{examRegistrationId}
 	</update>
-	<update id="updateSessionId">
-		UPDATE student_exam_result SET session_id_ = #{sessionId},update_time_ = NOW()
-		WHERE exam_registration_id_ = #{examRegistrationId}
-	</update>
 
     <!-- 根据主键删除一条记录 -->
 	<delete id="delete" >

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/StudentExamResultController.java

@@ -70,12 +70,6 @@ public class StudentExamResultController extends BaseController {
         studentExamResultService.updateFinishedExam(examRegistrationId,finishedExam);
     }
 
-    @ApiOperation("修改SessionId")
-    @PostMapping(value = "/api/updateSessionId")
-    public void updateSessionId(Long examRegistrationId,String sessionId){
-        studentExamResultService.updateSessionId(examRegistrationId,sessionId);
-    }
-
     @ApiOperation("获取考试结果")
     @PostMapping(value = "/api/get")
     public StudentExamResultApiDto get(Long id){