新

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamRecordForMarkingCloudServiceProvider.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 import javax.persistence.criteria.Predicate;
 
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamRecordDataBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.GetSingleExamRecordDataReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetSingleExamRecordDataResp;
 import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordDataEntity;
@@ -201,7 +202,7 @@ public class ExamRecordForMarkingCloudServiceProvider extends ControllerSupport
         Check.isNull(req.getId(), "id不能为空");
         ExamRecordDataEntity entity = GlobalHelper.getEntity(examRecordDataRepo, req.getId(), ExamRecordDataEntity.class);
         if (entity == null) {
-            return null;
+            return new GetSingleExamRecordDataResp();
         }
 
         return copyGetSingleExamRecordDataRespFrom(entity);
@@ -209,45 +210,49 @@ public class ExamRecordForMarkingCloudServiceProvider extends ControllerSupport
 
     private GetSingleExamRecordDataResp copyGetSingleExamRecordDataRespFrom(ExamRecordDataEntity entity) {
         GetSingleExamRecordDataResp resp = new GetSingleExamRecordDataResp();
-        resp.setId(entity.getId());
-        resp.setExamId(entity.getExamId());
-        resp.setExamType(entity.getExamType().toString());
-        resp.setExamStudentId(entity.getExamStudentId());
-        resp.setStudentId(entity.getStudentId());
-        resp.setStudentCode(entity.getStudentCode());
-        resp.setStudentName(entity.getStudentName());
-        resp.setIdentityNumber(entity.getIdentityNumber());
-        resp.setCourseId(entity.getCourseId());
-        resp.setCourseLevel(entity.getCourseLevel());
-        resp.setOrgId(entity.getOrgId());
-        resp.setRootOrgId(entity.getRootOrgId());
-        resp.setBasePaperId(entity.getBasePaperId());
-        resp.setPaperType(entity.getPaperType());
-        resp.setPaperStructId(entity.getPaperStructId());
-        resp.setInfoCollector(entity.getInfoCollector());
-        resp.setExamRecordQuestionsId(entity.getExamRecordQuestionsId());
-        resp.setExamRecordStatus(entity.getExamRecordStatus().toString());
-        resp.setStartTime(entity.getStartTime());
-        resp.setEndTime(entity.getEndTime());
-        resp.setCleanTime(entity.getCleanTime());
-        resp.setWarn(entity.getIsWarn());
-        resp.setAudit(entity.getIsAudit());
-        resp.setIllegality(entity.getIsIllegality());
-        resp.setUsedExamTime(entity.getUsedExamTime());
-        resp.setExamOrder(entity.getExamOrder());
-        resp.setReexamine(entity.getIsReexamine());
-        resp.setContinued(entity.getIsContinued());
-        resp.setAllObjectivePaper(entity.getIsAllObjectivePaper());
-        resp.setContinuedCount(entity.getContinuedCount());
-        resp.setExceed(entity.getIsExceed());
-        resp.setFaceSuccessCount(entity.getFaceSuccessCount());
-        resp.setFaceFailedCount(entity.getFaceFailedCount());
-        resp.setFaceStrangerCount(entity.getFaceStrangerCount());
-        resp.setFaceTotalCount(entity.getFaceTotalCount());
-        resp.setFaceSuccessPercent(entity.getFaceSuccessPercent());
-        resp.setFaceVerifyResult(entity.getFaceVerifyResult().toString());
-        resp.setBaiduFaceLivenessSuccessPercent(entity.getBaiduFaceLivenessSuccessPercent());
-        resp.setFaceLandmarkVal(entity.getFaceLandmarkVal());
+
+        ExamRecordDataBean data = new ExamRecordDataBean();
+        data.setId(entity.getId());
+        data.setExamId(entity.getExamId());
+        data.setExamType(entity.getExamType().toString());
+        data.setExamStudentId(entity.getExamStudentId());
+        data.setStudentId(entity.getStudentId());
+        data.setStudentCode(entity.getStudentCode());
+        data.setStudentName(entity.getStudentName());
+        data.setIdentityNumber(entity.getIdentityNumber());
+        data.setCourseId(entity.getCourseId());
+        data.setCourseLevel(entity.getCourseLevel());
+        data.setOrgId(entity.getOrgId());
+        data.setRootOrgId(entity.getRootOrgId());
+        data.setBasePaperId(entity.getBasePaperId());
+        data.setPaperType(entity.getPaperType());
+        data.setPaperStructId(entity.getPaperStructId());
+        data.setInfoCollector(entity.getInfoCollector());
+        data.setExamRecordQuestionsId(entity.getExamRecordQuestionsId());
+        data.setExamRecordStatus(entity.getExamRecordStatus().toString());
+        data.setStartTime(entity.getStartTime());
+        data.setEndTime(entity.getEndTime());
+        data.setCleanTime(entity.getCleanTime());
+        data.setWarn(entity.getIsWarn());
+        data.setAudit(entity.getIsAudit());
+        data.setIllegality(entity.getIsIllegality());
+        data.setUsedExamTime(entity.getUsedExamTime());
+        data.setExamOrder(entity.getExamOrder());
+        data.setReexamine(entity.getIsReexamine());
+        data.setContinued(entity.getIsContinued());
+        data.setAllObjectivePaper(entity.getIsAllObjectivePaper());
+        data.setContinuedCount(entity.getContinuedCount());
+        data.setExceed(entity.getIsExceed());
+        data.setFaceSuccessCount(entity.getFaceSuccessCount());
+        data.setFaceFailedCount(entity.getFaceFailedCount());
+        data.setFaceStrangerCount(entity.getFaceStrangerCount());
+        data.setFaceTotalCount(entity.getFaceTotalCount());
+        data.setFaceSuccessPercent(entity.getFaceSuccessPercent());
+        data.setFaceVerifyResult(entity.getFaceVerifyResult().toString());
+        data.setBaiduFaceLivenessSuccessPercent(entity.getBaiduFaceLivenessSuccessPercent());
+        data.setFaceLandmarkVal(entity.getFaceLandmarkVal());
+
+        resp.setData(data);
         return resp;
     }