yonge 3 tahun lalu
induk
melakukan
9b6c9c68ff

+ 16 - 2
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Student.java

@@ -1,10 +1,14 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.auth.api.entity.SysUser;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.ym.mec.auth.api.entity.SysUser;
 
 /**
  * 对应数据库表(student):
@@ -78,6 +82,8 @@ public class Student extends SysUser {
 	private Integer countFlag;
 	
 	private String extSubjectIds;
+	
+	private Map<Integer,String> extSjectNamesMap = new HashMap<Integer, String>();
 
 	@ApiModelProperty(value = "家长姓名")
 	private String parentName;
@@ -326,4 +332,12 @@ public class Student extends SysUser {
 	public void setExtSubjectIds(String extSubjectIds) {
 		this.extSubjectIds = extSubjectIds;
 	}
+
+	public Map<Integer, String> getExtSjectNamesMap() {
+		return extSjectNamesMap;
+	}
+
+	public void setExtSjectNamesMap(Map<Integer, String> extSjectNamesMap) {
+		this.extSjectNamesMap = extSjectNamesMap;
+	}
 }

+ 6 - 0
mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -159,6 +159,12 @@ public class StudentManageController extends BaseController {
 			List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getSubjectIdList());
 			student.setSubjectNames(subjectList.stream().map(t -> t.getName()).collect(Collectors.joining(",")));
 		}
+		
+		if(StringUtils.isNotBlank(student.getExtSubjectIds())){
+			List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getExtSubjectIds());
+			
+			student.setExtSjectNamesMap(subjectList.stream().collect(Collectors.toMap(Subject :: getId, Subject :: getName)));
+		}
 
 		Map<String, Object> datas = new HashMap<String, Object>();
 		datas.put("student", student);