...

examcloud-task-api-provider/src/main/java/cn/com/qmth/examcloud/task/api/controller/ExamStudentImportController.java

@@ -32,8 +32,13 @@ import cn.com.qmth.examcloud.commons.base.util.PathUtil;
 import cn.com.qmth.examcloud.commons.web.helpers.page.PageInfo;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.core.basic.api.OrgCloudService;
+import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
+import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
 import cn.com.qmth.examcloud.task.api.controller.bean.ExamStudentImportDomain;
 import cn.com.qmth.examcloud.task.dao.ExamStudentImportRepo;
 import cn.com.qmth.examcloud.task.dao.entity.ExamStudentImportEntity;
@@ -60,6 +65,9 @@ public class ExamStudentImportController extends ControllerSupport {
 	@Autowired
 	ExamStudentImportRepo examStudentImportRepo;
 
+	@Autowired
+	OrgCloudService orgCloudService;
+
 	@Autowired
 	ExamCloudService examCloudService;
 
@@ -146,6 +154,20 @@ public class ExamStudentImportController extends ControllerSupport {
 			domain.setErrorDesc(cur.getErrorDesc());
 			domain.setCreationTime(cur.getCreationTime());
 			domain.setUpdateTime(cur.getUpdateTime());
+
+			GetExamReq req = new GetExamReq();
+			req.setId(domain.getExamId());
+			req.setRootOrgId(domain.getRootOrgId());
+			GetExamResp examResp = examCloudService.getExam(req);
+			domain.setExamName(examResp.getName());
+
+			GetOrgReq getOrgReq = new GetOrgReq();
+			getOrgReq.setOrgId(domain.getRootOrgId());
+			getOrgReq.setRootOrgId(rootOrgId);
+			GetOrgResp getOrgResp = orgCloudService.getOrg(getOrgReq);
+			OrgBean org = getOrgResp.getOrg();
+			domain.setRootOrgName(org.getName());
+
 			ret.add(domain);
 		}
 

examcloud-task-api-provider/src/main/java/cn/com/qmth/examcloud/task/api/controller/bean/ExamStudentImportDomain.java

@@ -32,11 +32,21 @@ public class ExamStudentImportDomain implements JsonSerializable {
 	 */
 	private Long examId;
 
+	/**
+	 * 考试名称
+	 */
+	private String examName;
+
 	/**
 	 * 顶级机构ID
 	 */
 	private Long rootOrgId;
 
+	/**
+	 * 顶级机构名称
+	 */
+	private String rootOrgName;
+
 	/**
 	 * 状态
 	 */
@@ -116,6 +126,14 @@ public class ExamStudentImportDomain implements JsonSerializable {
 		this.examId = examId;
 	}
 
+	public String getExamName() {
+		return examName;
+	}
+
+	public void setExamName(String examName) {
+		this.examName = examName;
+	}
+
 	public Long getRootOrgId() {
 		return rootOrgId;
 	}
@@ -124,6 +142,14 @@ public class ExamStudentImportDomain implements JsonSerializable {
 		this.rootOrgId = rootOrgId;
 	}
 
+	public String getRootOrgName() {
+		return rootOrgName;
+	}
+
+	public void setRootOrgName(String rootOrgName) {
+		this.rootOrgName = rootOrgName;
+	}
+
 	public String getStatus() {
 		return status;
 	}