|
@@ -9,6 +9,7 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
|
|
import cn.com.qmth.examcloud.core.oe.admin.dao.entity.*;
|
|
import cn.com.qmth.examcloud.core.oe.admin.dao.entity.*;
|
|
import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
|
|
import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
|
|
import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordPaperStructService;
|
|
import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordPaperStructService;
|
|
|
|
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordQuestionsService;
|
|
import cn.com.qmth.examcloud.core.oe.admin.service.PracticeService;
|
|
import cn.com.qmth.examcloud.core.oe.admin.service.PracticeService;
|
|
import cn.com.qmth.examcloud.core.oe.admin.service.bean.PaperStructInfo;
|
|
import cn.com.qmth.examcloud.core.oe.admin.service.bean.PaperStructInfo;
|
|
import cn.com.qmth.examcloud.core.oe.admin.service.bean.PracticeCourseInfo;
|
|
import cn.com.qmth.examcloud.core.oe.admin.service.bean.PracticeCourseInfo;
|
|
@@ -52,6 +53,9 @@ public class PracticeServiceImpl implements PracticeService {
|
|
@Autowired
|
|
@Autowired
|
|
private ExamRecordPaperStructService examRecordPaperStructService;
|
|
private ExamRecordPaperStructService examRecordPaperStructService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private ExamRecordQuestionsService examRecordQuestionsService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public List<PracticeCourseInfo> queryPracticeCourseList(Long examId, Long studentId) {
|
|
public List<PracticeCourseInfo> queryPracticeCourseList(Long examId, Long studentId) {
|
|
if (examId == null || studentId == null) {
|
|
if (examId == null || studentId == null) {
|
|
@@ -155,7 +159,9 @@ public class PracticeServiceImpl implements PracticeService {
|
|
|
|
|
|
ExamScoreEntity examScoreEntity = examScoreRepo.findByExamRecordDataId(examRecordData.getId());
|
|
ExamScoreEntity examScoreEntity = examScoreRepo.findByExamRecordDataId(examRecordData.getId());
|
|
practiceRecordInfo.setObjectiveAccuracy(examScoreEntity.getObjectiveAccuracy());//客观题答对的比率
|
|
practiceRecordInfo.setObjectiveAccuracy(examScoreEntity.getObjectiveAccuracy());//客观题答对的比率
|
|
- ExamRecordQuestionsEntity examRecordQuestions = examRecordQuestionsRepo.findByExamRecordDataId(examRecordData.getId());
|
|
|
|
|
|
+ ExamRecordQuestionsEntity examRecordQuestions =
|
|
|
|
+ examRecordQuestionsService.getExamRecordQuestionsAndFixExamRecordDataIfNecessary(examRecordData.getId());
|
|
|
|
+
|
|
List<ExamQuestionEntity> examQuestionEntities = examRecordQuestions.getExamQuestionEntities();
|
|
List<ExamQuestionEntity> examQuestionEntities = examRecordQuestions.getExamQuestionEntities();
|
|
practiceRecordInfo = calculationExamQuestionSituationInfo(practiceRecordInfo, examQuestionEntities);
|
|
practiceRecordInfo = calculationExamQuestionSituationInfo(practiceRecordInfo, examQuestionEntities);
|
|
|
|
|