Эх сурвалжийг харах

bug fix studentCode的返回值改为身份证号,主观题接口返回nextId不正确的bug fix

lideyin 5 жил өмнө
parent
commit
5396b602bb

+ 2 - 1
examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamRecordCloudServiceProvider.java

@@ -300,6 +300,7 @@ public class ExamRecordCloudServiceProvider extends ControllerSupport implements
                 pagedBean.setExamId(examId);
                 pagedBean.setStudentName(examStu.getStudentName());
                 pagedBean.setStudentCode(examStu.getStudentCode());
+                pagedBean.setIdentityNumber(examStu.getIdentityNumber());
                 pagedBean.setCourseCode(courseCode);
                 pagedBean.setCourseName(course.getName());
                 pagedBean.setPaperType(examStu.getPaperType());
@@ -314,7 +315,7 @@ public class ExamRecordCloudServiceProvider extends ControllerSupport implements
             }
         }
 
-        nextId = limitedExamStuList.get(limitedExamStuList.size() - 1).getId() + 1;
+        nextId = limitedExamStuList.get(limitedExamStuList.size() - 1).getExamStudentId() + 1;
         resp.setNextId(nextId);
         resp.setToBeMarkExamRecordBeanList(pagedToBeMarkList);
         return resp;

+ 5 - 10
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordForMarkingServiceImpl.java

@@ -11,6 +11,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
+import cn.com.qmth.examcloud.support.enums.ExamProperties;
+import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -100,12 +102,8 @@ public class ExamRecordForMarkingServiceImpl implements ExamRecordForMarkingServ
      * @return
      */
     private String getMarkingType(Long examId) {
-        GetExamPropertyReq getExamPropertyReq = new GetExamPropertyReq();
-        getExamPropertyReq.setExamId(examId);
-        getExamPropertyReq.setKey("MARKING_TYPE");
-        GetExamPropertyResp getExamPropertyResp = examCloudService.getExamProperty(getExamPropertyReq);
-
-        return getExamPropertyResp.getValue();
+        return ExamCacheTransferHelper.
+                getDefaultCachedExamProperty(examId, ExamProperties.MARKING_TYPE.name()).getValue();
     }
 
     @Override
@@ -135,10 +133,7 @@ public class ExamRecordForMarkingServiceImpl implements ExamRecordForMarkingServ
      * @return
      */
     private ExamType getExamType(Long examId) {
-        GetExamReq getExamReq = new GetExamReq();
-        getExamReq.setId(examId);
-        GetExamResp getExamResp = examCloudService.getExam(getExamReq);
-        return ExamType.valueOf(getExamResp.getExamBean().getExamType());
+        return ExamType.valueOf(ExamCacheTransferHelper.getDefaultCachedExam(examId).getExamType());
     }
 
     /**