|
@@ -5,6 +5,7 @@ import cn.com.qmth.scancentral.bean.User;
|
|
import cn.com.qmth.scancentral.dao.ExamDao;
|
|
import cn.com.qmth.scancentral.dao.ExamDao;
|
|
import cn.com.qmth.scancentral.entity.ExamEntity;
|
|
import cn.com.qmth.scancentral.entity.ExamEntity;
|
|
import cn.com.qmth.scancentral.entity.ExamSummaryEntity;
|
|
import cn.com.qmth.scancentral.entity.ExamSummaryEntity;
|
|
|
|
+import cn.com.qmth.scancentral.entity.SubjectEntity;
|
|
import cn.com.qmth.scancentral.enums.*;
|
|
import cn.com.qmth.scancentral.enums.*;
|
|
import cn.com.qmth.scancentral.exception.ParameterExceptions;
|
|
import cn.com.qmth.scancentral.exception.ParameterExceptions;
|
|
import cn.com.qmth.scancentral.service.*;
|
|
import cn.com.qmth.scancentral.service.*;
|
|
@@ -415,7 +416,10 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
|
|
exam.setMode(domain.getMode());
|
|
exam.setMode(domain.getMode());
|
|
exam.setPaperTypeBarcodeContent(domain.getPaperTypeBarcodeContent());
|
|
exam.setPaperTypeBarcodeContent(domain.getPaperTypeBarcodeContent());
|
|
if (getById(domain.getId()) == null) {
|
|
if (getById(domain.getId()) == null) {
|
|
- omrGroupService.addFixOmrCondition(1L, exam.getId(), null);
|
|
|
|
|
|
+ List<SubjectEntity> subjects = subjectService.listByExamId(exam.getId());
|
|
|
|
+ for (SubjectEntity subject : subjects) {
|
|
|
|
+ omrGroupService.addFixOmrCondition(1L, exam.getId(), subject.getCode());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
exam.setExamNumberFillCount(domain.getExamNumberFillCount());
|
|
exam.setExamNumberFillCount(domain.getExamNumberFillCount());
|
|
this.saveOrUpdate(exam);
|
|
this.saveOrUpdate(exam);
|