update

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

@@ -145,4 +145,15 @@ public interface StudentExamResultDao extends BaseDAO<Long, StudentExamResult> {
      * @return void
      */
     void updateVideoExam(Long examRegistrationId);
+
+    /**
+     * @describe 获取当前分部下所有学员编号
+     * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+     * @author zouxuan
+     * @date 2020/8/26
+     * @time 11:07
+     * @param organId:
+     * @return java.util.List<java.lang.Integer>
+     */
+    List<Integer> queryStudentByOrganId(Integer organId);
 }

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

@@ -34,12 +34,23 @@ public class ExamReviewRecordDto {
     @ApiModelProperty(value = "视频地址")
     private String videoUrl;
 
+    @ApiModelProperty(value = "附加评价")
+    private String additionalEvaluation;
+
     @ApiModelProperty(value = "评分")
     private Integer evaluationResult;
 
     @ApiModelProperty(value = "评审编号")
     private Integer examReviewId;
 
+    public String getAdditionalEvaluation() {
+        return additionalEvaluation;
+    }
+
+    public void setAdditionalEvaluation(String additionalEvaluation) {
+        this.additionalEvaluation = additionalEvaluation;
+    }
+
     public Integer getOpenFlag() {
         return openFlag;
     }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/entity/ExamReview.java

@@ -49,12 +49,23 @@ public class ExamReview {
 	
 	private String tenantId;
 
+	@ApiModelProperty(value = "附加评价")
+	private String additionalEvaluation;
+
 	@ApiModelProperty(value = "能否编辑")
 	private YesOrNoEnum enableEdit;
 
 	@ApiModelProperty(value = "考试基本信息")
 	private ExaminationBasic examinationBasic;
 
+	public String getAdditionalEvaluation() {
+		return additionalEvaluation;
+	}
+
+	public void setAdditionalEvaluation(String additionalEvaluation) {
+		this.additionalEvaluation = additionalEvaluation;
+	}
+
 	public Long getExamRegistrationId() {
 		return examRegistrationId;
 	}

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

@@ -186,12 +186,13 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             //获取考试次数
             Map<Integer, Integer> examNumMap = MapUtil.convertMybatisMap(studentExamResultDao.countExamNum(studentIds, queryInfo.getTenantId()),Integer.class,Integer.class);
 
+            List<Integer> studentId = studentExamResultDao.queryStudentByOrganId(organId);
+
             dataList.forEach(e -> {
                 e.setExamNum(examNumMap.get(e.getUserId()));
-                if(organId != null){
-                    if(e.getOrganId() != organId){
-                        e.getSysUser().setPhone(ValueUtil.fuzzyMobile(e.getSysUser().getPhone()));
-                    }
+                if (!studentId.contains(e.getUserId())){
+                    e.getSysUser().setPhone(ValueUtil.fuzzyMobile(e.getSysUser().getPhone()));
+                    e.setPhone(ValueUtil.fuzzyMobile(e.getSysUser().getPhone()));
                 }
             });
         }

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

@@ -20,6 +20,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
 		<result column="enable_edit_" property="enableEdit" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
+		<result column="additional_evaluation_" property="additionalEvaluation"/>
 		<association property="examinationBasic" column="exam_" resultMap="com.keao.edu.user.dao.ExaminationBasicDao.ExaminationBasic"/>
 	</resultMap>
 
@@ -41,17 +42,20 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamReview" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO exam_review (id_,examination_basic_id_,exam_room_id_,teacher_id_,teacher_type_,student_id_,evaluation_content_,
-		evaluation_result_,create_time_,update_time_,tenant_id_,enable_edit_,exam_registration_id_)
+		evaluation_result_,create_time_,update_time_,tenant_id_,enable_edit_,exam_registration_id_,additional_evaluation_)
 		VALUES(#{id},#{examinationBasicId},#{examRoomId},#{teacherId},
 		#{teacherType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{studentId},#{evaluationContent},
 		#{evaluationResult},NOW(),NOW(),
-		#{tenantId},#{enableEdit,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examRegistrationId})
+		#{tenantId},#{enableEdit,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examRegistrationId},#{additionalEvaluation})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.keao.edu.user.entity.ExamReview">
 		UPDATE exam_review
 		<set>
+			<if test="additionalEvaluation != null">
+				additional_evaluation_ = #{additionalEvaluation},
+			</if>
 			<if test="examinationBasicId != null">
 				examination_basic_id_ = #{examinationBasicId},
 			</if>
@@ -208,6 +212,7 @@
 		<result property="videoUrl" column="video_url_"/>
 		<result property="examRegistrationId" column="exam_registration_id_"/>
 		<result property="openFlag" column="open_flag_"/>
+		<result property="additionalEvaluation" column="additional_evaluation_"/>
 	</resultMap>
 	<sql id="queryExamReviewRecordListSql">
 		<where>
@@ -228,7 +233,7 @@
 
 	<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_,ser.video_url_,erm.open_flag_
+		er.evaluation_result_,ersr.exam_registration_id_,er.id_,ersr.student_id_,ser.video_url_,erm.open_flag_,er.additional_evaluation_
 		FROM exam_room_student_relation ersr
 		LEFT JOIN exam_room erm ON erm.id_ = ersr.exam_room_id_
 		LEFT JOIN student_exam_result ser ON ser.exam_registration_id_ = ersr.exam_registration_id_

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

@@ -324,4 +324,8 @@
     <select id="getIsFinishedExamRegistIds" resultType="Long">
 		SELECT exam_registration_id_ FROM student_exam_result WHERE examination_basic_id_=#{examId} AND is_finished_exam_=5;
     </select>
+    <select id="queryStudentByOrganId" resultType="java.lang.Integer">
+		SELECT DISTINCT(er.student_id_) FROM exam_registration er
+		WHERE organ_id_ = #{organId}
+	</select>
 </mapper>

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

@@ -117,7 +117,7 @@
 		</if>
 	</select>
 	<select id="queryRegistrationList" resultMap="Student">
-		SELECT su.* FROM exam_registration er
+		SELECT su.phone_,su.real_name_,su.id_ user_id_ FROM exam_registration er
 		LEFT JOIN sys_user su ON er.student_id_ = su.id_
 		WHERE su.del_flag_ = 0 AND su.lock_flag_ = 0
 		<if test="search != null and search != ''">