Merge remote-tracking branch 'origin/master'

edu-im/edu-im-server/src/main/java/com/keao/edu/im/pojo/RoomResult.java

@@ -34,6 +34,7 @@ public class RoomResult {
         boolean camera;
         boolean microphone;
         boolean handUp;
+        String shieldUserId;
     }
 
     @Data

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -263,6 +263,7 @@ public class RoomServiceImpl implements RoomService {
         RoomResult roomResult = new RoomResult();
         BaseResponse baseResponse = new BaseResponse(roomResult);
         RoomResult.MemberResult userResult = new RoomResult.MemberResult();
+        userResult.setShieldUserId(examRoom.getShieldUserId());
         List<RoomMember> memberList = roomMemberDao.findByRidAndUid(roomId, userId);
         if (memberList.isEmpty()) {
             if(sysUser.getId().equals(examRoom.getMainTeacherUserId())){

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamRoomListQueryInfo.java

@@ -19,6 +19,16 @@ public class ExamRoomListQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "考试状态")
     private String examBaseStatus;
 
+    private Integer openFlag;
+
+    public Integer getOpenFlag() {
+        return openFlag;
+    }
+
+    public void setOpenFlag(Integer openFlag) {
+        this.openFlag = openFlag;
+    }
+
     public String getExamMode() {
         return examMode;
     }

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

@@ -73,10 +73,10 @@
 		UPDATE exam_room
 		<set>
 			<if test="shieldUserId != null">
-				exam_flag_ = #{shieldUserId},
+				shield_user_id_ = #{shieldUserId},
 			</if>
 			<if test="examFlag != null">
-				shield_user_id_ = #{examFlag},
+				exam_flag_ = #{examFlag},
 			</if>
 			<if test="delFlag != null">
 				del_flag_ = #{delFlag},
@@ -327,6 +327,12 @@
 			<if test="examMode != null and examMode != ''">
 				AND er.exam_mode_ = #{examMode}
 			</if>
+			<if test="openFlag != null and openFlag == 1">
+				AND er.open_flag_ = #{openFlag}
+			</if>
+			<if test="openFlag != null and openFlag == 0">
+				AND er.open_flag_ = #{openFlag}
+			</if>
 		</where>
 	</sql>
 	<select id="countExamRoomPage" resultType="java.lang.Integer">

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

@@ -213,11 +213,10 @@
 		<result property="signInTime" column="sign_in_time_"/>
 		<result property="examRoomStudentRelationId" column="exam_room_student_relation_id_"/>
 		<result property="finishedExam" column="is_finished_exam_"/>
-		<result property="shieldUserId" column="shield_user_id_"/>
 	</resultMap>
 	<select id="queryStudentList" resultMap="RoomStudentListDtoMap">
 		SELECT ersr.id_ exam_room_student_relation_id_,ersr.exam_registration_id_,su.real_name_,ersr.sign_in_time_,
-		s.name_ subject_name_,ec.level_,ersr.exam_room_id_,ersr.student_id_,ser.is_finished_exam_,ser.shield_user_id_
+		s.name_ subject_name_,ec.level_,ersr.exam_room_id_,ersr.student_id_,ser.is_finished_exam_
 		FROM exam_room_student_relation ersr
 		LEFT JOIN exam_certification ec ON ec.exam_registration_id_ = ersr.exam_registration_id_
 		LEFT JOIN `subject` s ON s.id_ = ec.subject_id_