update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/EmployeeInfo.java

@@ -56,6 +56,8 @@ public class EmployeeInfo {
 
 	@ApiModelProperty(value = "声部", required = false)
 	private String subjectIdList;
+	
+	private String subjectName;
 
 	@ApiModelProperty(value = "评估结果", required = false)
 	private String assessmentResult;
@@ -68,6 +70,8 @@ public class EmployeeInfo {
 
 	@ApiModelProperty(value = "分部", required = false)
 	private Integer organId;
+	
+	private String organName;
 
 	@ApiModelProperty(value = "职位", required = false)
 	private JobTypeEnum position;
@@ -89,6 +93,8 @@ public class EmployeeInfo {
 
 	@ApiModelProperty(value = "操作人编号", required = false)
 	private Integer operatorId;
+	
+	private String operatorName;
 
 	@ApiModelProperty(value = "信息来源", required = false)
 	private String sourceFrom;
@@ -339,6 +345,30 @@ public class EmployeeInfo {
 		this.sourceFrom = sourceFrom;
 	}
 
+	public String getSubjectName() {
+		return subjectName;
+	}
+
+	public void setSubjectName(String subjectName) {
+		this.subjectName = subjectName;
+	}
+
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
+	public String getOperatorName() {
+		return operatorName;
+	}
+
+	public void setOperatorName(String operatorName) {
+		this.operatorName = operatorName;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/resources/config/mybatis/EmployeeInfoMapper.xml

@@ -33,6 +33,9 @@
 		<result column="source_from_" property="sourceFrom" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="organName" property="organName" />
+		<result column="subjectName" property="subjectName" />
+		<result column="operatorName" property="operatorName" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -182,7 +185,7 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="EmployeeInfo" parameterType="map">
-		SELECT o.name_,group_concat(s.name_),u.real_name_,ei.* FROM employee_info ei
+		SELECT o.name_ organName,group_concat(s.name_) subjectName,u.real_name_ operatorName,ei.* FROM employee_info ei
 		left join subject s on find_in_set(s.id_,ei.subject_id_list_)
 		left join organization o on o.id_ = ei.organ_id_
 		left join sys_user u on u.id_ = ei.operator_id_