|
|
@@ -37,14 +37,11 @@ import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
|
|
|
import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
|
|
|
import cn.com.qmth.examcloud.core.basic.api.OrgCloudService;
|
|
|
import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
|
|
|
-import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
|
|
|
import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
|
|
|
import cn.com.qmth.examcloud.core.basic.api.bean.StudentBean;
|
|
|
-import cn.com.qmth.examcloud.core.basic.api.request.GetCourseReq;
|
|
|
import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
|
|
|
import cn.com.qmth.examcloud.core.basic.api.request.GetStudentReq;
|
|
|
import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentReq;
|
|
|
-import cn.com.qmth.examcloud.core.basic.api.response.GetCourseResp;
|
|
|
import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
|
|
|
import cn.com.qmth.examcloud.core.basic.api.response.GetStudentResp;
|
|
|
import cn.com.qmth.examcloud.core.basic.api.response.SaveStudentResp;
|
|
|
@@ -183,12 +180,6 @@ public class ExamStudentController extends ControllerSupport {
|
|
|
for (ExamStudentEntity cur : examStudents) {
|
|
|
ExamEntity exam = examRepo.findOne(cur.getExamId());
|
|
|
|
|
|
- GetCourseReq req = new GetCourseReq();
|
|
|
- req.setId(cur.getCourseId());
|
|
|
- req.setRootOrgId(accessUser.getRootOrgId());
|
|
|
- GetCourseResp getCourseResp = courseCloudService.getCourse(req);
|
|
|
- CourseBean courseBean = getCourseResp.getCourseBean();
|
|
|
-
|
|
|
GetOrgReq getOrgReq = new GetOrgReq();
|
|
|
getOrgReq.setOrgId(cur.getOrgId());
|
|
|
GetOrgResp getOrgResp = orgCloudService.getOrg(getOrgReq);
|
|
|
@@ -204,7 +195,7 @@ public class ExamStudentController extends ControllerSupport {
|
|
|
if (null != withStarted && withStarted) {
|
|
|
CheckExamIsStartedReq checkExamIsStartedReq = new CheckExamIsStartedReq();
|
|
|
checkExamIsStartedReq.setExamId(exam.getId());
|
|
|
- checkExamIsStartedReq.setCourseId(courseBean.getId());
|
|
|
+ checkExamIsStartedReq.setCourseId(cur.getCourseId());
|
|
|
checkExamIsStartedReq.setStudentId(studentBean.getId());
|
|
|
checkExamIsStartedReq.setExamId(exam.getId());
|
|
|
try {
|
|
|
@@ -225,8 +216,8 @@ public class ExamStudentController extends ControllerSupport {
|
|
|
bean.setStudentName(cur.getName());
|
|
|
bean.setStudentCode(cur.getStudentCode());
|
|
|
bean.setIdentityNumber(cur.getIdentityNumber());
|
|
|
- bean.setCourseCode(courseBean.getCode());
|
|
|
- bean.setCourseName(courseBean.getName());
|
|
|
+ bean.setCourseCode(cur.getCourseCode());
|
|
|
+ bean.setCourseName(cur.getCourseName());
|
|
|
bean.setInfoCollector(cur.getInfoCollector());
|
|
|
bean.setOrgId(cur.getOrgId());
|
|
|
bean.setOrgCode(org.getCode());
|
wangwei