Merge remote-tracking branch 'origin/master'

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

@@ -1,6 +1,5 @@
 package com.keao.edu.user.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
@@ -87,6 +86,4 @@ public class StudentExamResultController extends BaseController {
         studentExamResultService.confirmStudent(examRegistrationId);
         return succeed();
     }
-
-
 }

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

@@ -23,6 +23,7 @@ public interface StudentExamResultDao extends BaseDAO<Long, StudentExamResult> {
      * @return java.util.List<com.keao.edu.user.entity.StudentExamResult>
      */
     List<StudentExamResult> queryStudentExamResult(Map<String, Object> params);
+
     int countStudentExamResult(Map<String, Object> params);
 
     /**

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExamReviewRecordDto.java

@@ -10,6 +10,9 @@ public class ExamReviewRecordDto {
     @ApiModelProperty(value = "学员编号")
     private Integer studentId;
 
+    @ApiModelProperty(value = "是否录制")
+    private Integer recordFlag;
+
     @ApiModelProperty(value = "考试状态，是否完成考试")
     private Integer finishedExam;
 
@@ -28,6 +31,14 @@ public class ExamReviewRecordDto {
     @ApiModelProperty(value = "评审编号")
     private Integer examReviewId;
 
+    public Integer getRecordFlag() {
+        return recordFlag;
+    }
+
+    public void setRecordFlag(Integer recordFlag) {
+        this.recordFlag = recordFlag;
+    }
+
     public Integer getStudentId() {
         return studentId;
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamReviewServiceImpl.java

@@ -91,7 +91,7 @@ public class ExamReviewServiceImpl extends BaseServiceImpl<Long, ExamReview> imp
 			params.put("offset", pageInfo.getOffset());
 			dataList = examReviewDao.queryExamReviewRecordList(params);
 			List<Integer> collect = dataList.stream().map(e -> e.getStudentId()).collect(Collectors.toList());
-			Map<String, String> realNames = getMap("sys_user", "id_", "real_name_", collect);
+			Map<Integer, String> realNames = getMap("sys_user", "id_", "real_name_", collect,Integer.class,String.class);
 			dataList.forEach(e->{
 				e.setRealName(realNames.get(e.getStudentId()));
 			});

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -280,7 +280,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			examRoomStudentRelationDao.update(examRoomStudentRelation);
 			publishMessage(examRoomStudentRelation,MemberChangedMessage.Action_Recorded,true);
 		}
-		nextStudent(nextExamRoomStudentRelationId,true);
+		nextStudent(nextExamRoomStudentRelationId,false);
 	}
 
 	@Override
@@ -320,7 +320,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 
 	@Override
 	public void nextBit(Long nextExamRoomStudentRelationId, Long currentExamRoomStudentRelationId, Integer examStatus,Long examRoomId) {
-		Boolean isPush = true;
+		Boolean isPush = false;
 		if(currentExamRoomStudentRelationId != null){
 			ExamRoomStudentRelation examRoomStudentRelation = examRoomStudentRelationDao.get(currentExamRoomStudentRelationId);
 			//将当前学员退出教室并添加参考状态，如果考试未完成，清除签到时间，重新签到
@@ -336,7 +336,6 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			examRoomStudentRelation.setClassroomSwitch(YesOrNoEnum.NO);
 			examRoomStudentRelationDao.update(examRoomStudentRelation);
 			publishMessage(examRoomStudentRelation,MemberChangedMessage.Student_Queue,isPush);
-			isPush = false;
 		}
 		nextStudent(nextExamRoomStudentRelationId,isPush);
 

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

@@ -185,6 +185,7 @@
 	<resultMap id="ExamReviewRecordDtoMap" type="com.keao.edu.user.dto.ExamReviewRecordDto">
 		<result property="recordStartTime" column="record_start_time_"/>
 		<result property="confirmStatus" column="confirm_status_"/>
+		<result property="recordFlag" column="record_flag_"/>
 		<result property="realName" column="real_name_"/>
 		<result property="studentId" column="student_id_"/>
 		<result property="evaluationContent" column="evaluation_content_"/>
@@ -208,6 +209,7 @@
 			</if>
 		</where>
 	</sql>
+
 	<select id="queryExamReviewRecordList" resultMap="ExamReviewRecordDtoMap">
 		SELECT ser.is_finished_exam_,ser.record_flag_,ser.confirm_status_,er.evaluation_content_,
 		er.evaluation_result_,ersr.exam_registration_id_,er.id_,ersr.student_id_
@@ -218,6 +220,7 @@
 		ORDER BY ser.is_finished_exam_ DESC
 		<include refid="global.limit"/>
 	</select>
+
 	<select id="findByRegistrationId" resultMap="ExamReviewRecordDtoMap">
 		SELECT * FROM exam_review WHERE exam_registration_id_ = #{examRegistrationId} AND teacher_id_ = #{teacherId} LIMIT 1
 	</select>