update

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

@@ -1,20 +1,41 @@
 package com.keao.edu.user.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 public class ExamReviewRecordDto {
+
+    @ApiModelProperty(value = "学员名称")
     private String realName;
 
+    @ApiModelProperty(value = "学员编号")
+    private Integer studentId;
+
+    @ApiModelProperty(value = "考试状态，是否完成考试")
     private Integer finishedExam;
 
+    @ApiModelProperty(value = "考试形态，直播还是录播")
     private Integer confirmStatus;
 
+    @ApiModelProperty(value = "开始录制时间")
     private Integer recordStartTime;
 
+    @ApiModelProperty(value = "评价")
     private String evaluationContent;
 
+    @ApiModelProperty(value = "评分")
     private Integer evaluationResult;
 
+    @ApiModelProperty(value = "评审编号")
     private Integer examReviewId;
 
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
     public String getRealName() {
         return realName;
     }

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

@@ -90,6 +90,12 @@ public class ExamReviewServiceImpl extends BaseServiceImpl<Long, ExamReview> imp
 			pageInfo.setTotal(count);
 			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);
+			dataList.forEach(e->{
+				e.setRealName(realNames.get(e.getStudentId()));
+			});
+			pageInfo.setRows(dataList);
 		}
 		return pageInfo;
 	}

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

@@ -106,12 +106,22 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				user.setRealName(organ.getContactName());
 				user.setPhone(organ.getContactPhone());
 				sysUserDao.update(user);
-				Employee employee = new Employee();
-				employee.setOrganId(organ.getId());
-				employee.setUserId(user.getId());
-				employee.setTenantId(organ.getTenantId());
-				employee.setEmployeeType("ORGAN");
-				employeeDao.insert(employee);
+				Employee employee = employeeDao.get(user.getId());
+				if(employee == null){
+					employee = new Employee();
+					employee.setOrganId(organ.getId());
+					employee.setUserId(user.getId());
+					employee.setTenantId(organ.getTenantId());
+					employee.setEmployeeType("ORGAN");
+					employeeDao.insert(employee);
+				}else {
+					employee.setDelFlag(false);
+					employee.setOrganId(organ.getId());
+					employee.setUserId(user.getId());
+					employee.setTenantId(organ.getTenantId());
+					employee.setEmployeeType("ORGAN");
+					employeeDao.update(employee);
+				}
 			}else if(organization.getDelFlag() == YesOrNoEnum.YES){
 				SysUser sysUser1 = organization.getSysUser();
 				if(StringUtils.isEmpty(sysUser1.getUserType())){

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

@@ -183,13 +183,14 @@
 		<include refid="queryExamReviewRecordListSql"/>
 	</select>
 	<resultMap id="ExamReviewRecordDtoMap" type="com.keao.edu.user.dto.ExamReviewRecordDto">
-		<result property="recordStartTime" column=""/>
-		<result property="confirmStatus" column=""/>
-		<result property="realName" column=""/>
-		<result property="evaluationContent" column=""/>
-		<result property="evaluationResult" column=""/>
-		<result property="examReviewId" column=""/>
-		<result property="finishedExam" column=""/>
+		<result property="recordStartTime" column="record_start_time_"/>
+		<result property="confirmStatus" column="confirm_status_"/>
+		<result property="realName" column="real_name_"/>
+		<result property="studentId" column="student_id_"/>
+		<result property="evaluationContent" column="evaluation_content_"/>
+		<result property="evaluationResult" column="evaluation_result_"/>
+		<result property="examReviewId" column="id_"/>
+		<result property="finishedExam" column="is_finished_exam_"/>
 	</resultMap>
 	<sql id="queryExamReviewRecordListSql">
 		<where>
@@ -208,7 +209,8 @@
 		</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_
+		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_
 		FROM exam_room_student_relation ersr
 		LEFT JOIN student_exam_result ser ON ser.exam_registration_id_ = ersr.exam_registration_id_
 		LEFT JOIN exam_review er ON ser.exam_registration_id_ = er.exam_registration_id_