|
@@ -51,11 +51,14 @@ public class ExamRecordQuestionsServiceImpl implements ExamRecordQuestionsServic
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<ExamQuestionEntity> querySubjectiveAnswerList(Long examRecordDataId) {
|
|
public List<ExamQuestionEntity> querySubjectiveAnswerList(Long examRecordDataId) {
|
|
- ExamRecordDataEntity examRecordData =
|
|
|
|
- GlobalHelper.getEntity(examRecordDataRepo, examRecordDataId, ExamRecordDataEntity.class);
|
|
|
|
|
|
+ ExamRecordDataEntity examRecordData = GlobalHelper.getEntity(examRecordDataRepo, examRecordDataId, ExamRecordDataEntity.class);
|
|
|
|
|
|
- ExamRecordQuestionsEntity examRecordQuestionsEntity =
|
|
|
|
- GlobalHelper.getEntity(examRecordQuestionsRepo, examRecordData.getExamRecordQuestionsId(), ExamRecordQuestionsEntity.class);
|
|
|
|
|
|
+ ExamRecordQuestionsEntity examRecordQuestionsEntity;
|
|
|
|
+ if(StringUtils.isNotEmpty(examRecordData.getExamRecordQuestionsId())){
|
|
|
|
+ examRecordQuestionsEntity = GlobalHelper.getEntity(examRecordQuestionsRepo, examRecordData.getExamRecordQuestionsId(), ExamRecordQuestionsEntity.class);
|
|
|
|
+ }else {
|
|
|
|
+ examRecordQuestionsEntity = getExamRecordQuestionsAndFixExamRecordDataIfNecessary(examRecordData);
|
|
|
|
+ }
|
|
|
|
|
|
List<ExamQuestionEntity> examRecordQuestionList = examRecordQuestionsEntity.getExamQuestionEntities();
|
|
List<ExamQuestionEntity> examRecordQuestionList = examRecordQuestionsEntity.getExamQuestionEntities();
|
|
|
|
|
|
@@ -152,7 +155,7 @@ public class ExamRecordQuestionsServiceImpl implements ExamRecordQuestionsServic
|
|
examRecordQuestionsEntity.setExamRecordDataId(examRecordDataId);
|
|
examRecordQuestionsEntity.setExamRecordDataId(examRecordDataId);
|
|
examRecordQuestionsEntity.setCreationTime(new Date());
|
|
examRecordQuestionsEntity.setCreationTime(new Date());
|
|
ExamRecordQuestionsEntity saveResult = examRecordQuestionsRepo.save(examRecordQuestionsEntity);
|
|
ExamRecordQuestionsEntity saveResult = examRecordQuestionsRepo.save(examRecordQuestionsEntity);
|
|
-// redisTemplate.opsForList().leftPushAll(examQuestionKeyPrefix+examRecordDataId,examQuestionEntityList);
|
|
|
|
|
|
+ // redisTemplate.opsForList().leftPushAll(examQuestionKeyPrefix+examRecordDataId,examQuestionEntityList);
|
|
return saveResult;
|
|
return saveResult;
|
|
}
|
|
}
|
|
|
|
|