update

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamStudentCloudServiceProvider.java

@@ -165,8 +165,8 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
         resp.setExamStudentBean(examStudentBean);
 
         //操作日志
-        ReportsUtil.report(new OperateReport(saved.getRootOrgId(), null, saved.getStudentId(),saved.getId(), UserType.COMMON,
-        		OperateContent.EXAM_STUDENT_IMPORT.getDesc()));
+        ReportsUtil.report(new OperateReport(saved.getRootOrgId(), null, saved.getStudentId(), saved.getId(), UserType.COMMON,
+                OperateContent.EXAM_STUDENT_IMPORT.getDesc()));
         return resp;
     }
 
@@ -264,9 +264,9 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
             one.setExt5(es.getExt5());
 
             ExamStudentInfo saved = examStudentService.saveExamStudent(one);
-//            //操作日志
-//            ReportsUtil.report(new OperateReport(saved.getRootOrgId(), null, saved.getStudentId(),saved.getId(), UserType.COMMON,
-//            		OperateContent.EXAM_STUDENT_COPY.getDesc()));
+            //            //操作日志
+            //            ReportsUtil.report(new OperateReport(saved.getRootOrgId(), null, saved.getStudentId(),saved.getId(), UserType.COMMON,
+            //            		OperateContent.EXAM_STUDENT_COPY.getDesc()));
             examStudentIds.add(saved.getId());
 
             next = es.getId();
@@ -290,33 +290,37 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
     public GetExamStudentResp getExamStudent(@RequestBody GetExamStudentReq req) {
         Long examStudentId = req.getExamStudentId();
 
-        ExamStudentEntity saved = GlobalHelper.getEntity(examStudentRepo, examStudentId,
+        ExamStudentEntity examStudent = GlobalHelper.getEntity(examStudentRepo, examStudentId,
                 ExamStudentEntity.class);
 
-        ExamStudentBean examStudentBean = new ExamStudentBean();
-        examStudentBean.setId(saved.getId());
-        examStudentBean.setCourseCode(saved.getCourseCode());
-        examStudentBean.setCourseLevel(saved.getCourseLevel());
-        examStudentBean.setCourseName(saved.getCourseName());
-        examStudentBean.setExamId(saved.getExamId());
-        examStudentBean.setIdentityNumber(saved.getIdentityNumber());
-        examStudentBean.setStudentCode(saved.getStudentCode());
-        examStudentBean.setPaperType(saved.getPaperType());
-        examStudentBean.setRootOrgId(saved.getRootOrgId());
-        examStudentBean.setGrade(saved.getGrade());
-        examStudentBean.setCourseId(saved.getCourseId());
-        examStudentBean.setInfoCollector(saved.getInfoCollector());
-        examStudentBean.setExamSite(saved.getExamSite());
-        examStudentBean.setOrgId(saved.getOrgId());
-        examStudentBean.setOrgCode(saved.getOrgCode());
-        examStudentBean.setStudentName(saved.getName());
-        examStudentBean.setSpecialtyName(saved.getSpecialtyName());
+        if (examStudent == null) {
+            throw new StatusException("考生信息不存在！id=" + examStudentId);
+        }
 
-        examStudentBean.setExt1(saved.getExt1());
-        examStudentBean.setExt2(saved.getExt2());
-        examStudentBean.setExt3(saved.getExt3());
-        examStudentBean.setExt4(saved.getExt4());
-        examStudentBean.setExt5(saved.getExt5());
+        ExamStudentBean examStudentBean = new ExamStudentBean();
+        examStudentBean.setId(examStudent.getId());
+        examStudentBean.setCourseCode(examStudent.getCourseCode());
+        examStudentBean.setCourseLevel(examStudent.getCourseLevel());
+        examStudentBean.setCourseName(examStudent.getCourseName());
+        examStudentBean.setExamId(examStudent.getExamId());
+        examStudentBean.setIdentityNumber(examStudent.getIdentityNumber());
+        examStudentBean.setStudentCode(examStudent.getStudentCode());
+        examStudentBean.setPaperType(examStudent.getPaperType());
+        examStudentBean.setRootOrgId(examStudent.getRootOrgId());
+        examStudentBean.setGrade(examStudent.getGrade());
+        examStudentBean.setCourseId(examStudent.getCourseId());
+        examStudentBean.setInfoCollector(examStudent.getInfoCollector());
+        examStudentBean.setExamSite(examStudent.getExamSite());
+        examStudentBean.setOrgId(examStudent.getOrgId());
+        examStudentBean.setOrgCode(examStudent.getOrgCode());
+        examStudentBean.setStudentName(examStudent.getName());
+        examStudentBean.setSpecialtyName(examStudent.getSpecialtyName());
+
+        examStudentBean.setExt1(examStudent.getExt1());
+        examStudentBean.setExt2(examStudent.getExt2());
+        examStudentBean.setExt3(examStudent.getExt3());
+        examStudentBean.setExt4(examStudent.getExt4());
+        examStudentBean.setExt5(examStudent.getExt5());
 
         GetExamStudentResp resp = new GetExamStudentResp();
         resp.setExamStudentBean(examStudentBean);
@@ -500,12 +504,12 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
         examStudentService.syncExamStudent(saved.getId());
 
         //操作日志
-        if(enable) {
-        	ReportsUtil.report(new OperateReport(es.getRootOrgId(), null, es.getStudentId(),es.getId(), UserType.COMMON,
-        			OperateContent.EXAM_STUDENT_ENABLE.getDesc()));
-        }else {
-        	ReportsUtil.report(new OperateReport(es.getRootOrgId(), null, es.getStudentId(),es.getId(), UserType.COMMON,
-        			OperateContent.EXAM_STUDENT_DISABLE.getDesc()));
+        if (enable) {
+            ReportsUtil.report(new OperateReport(es.getRootOrgId(), null, es.getStudentId(), es.getId(), UserType.COMMON,
+                    OperateContent.EXAM_STUDENT_ENABLE.getDesc()));
+        } else {
+            ReportsUtil.report(new OperateReport(es.getRootOrgId(), null, es.getStudentId(), es.getId(), UserType.COMMON,
+                    OperateContent.EXAM_STUDENT_DISABLE.getDesc()));
         }
         UpdateExamStudentStatusResp resp = new UpdateExamStudentStatusResp();
         resp.setExamStudentId(saved.getId());