yin 8 mesi fa
parent
commit
9813572011

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/impl/ExamServiceImpl.java

@@ -286,7 +286,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         vo.getPackageTask().setTodoCount(packageTaskService.getCountByExamAndStatus(id, TaskStatus.WAITING));
         vo.getPackageTask().setFinishCount(packageTaskService.getCountByExamAndStatus(id, TaskStatus.PROCESSED));
 
-        vo.setSubjectConfig(subjectService.listConfigByExamId(id));
+        vo.setSubjectConfig(markSiteService.findByExam(id));
 
         return vo;
     }

+ 4 - 3
src/main/java/cn/com/qmth/scancentral/vo/scanexaminfo/ScanExamInfoVo.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.scancentral.vo.scanexaminfo;
 
+import cn.com.qmth.scancentral.vo.SubjectConfigVo;
 import cn.com.qmth.scancentral.vo.examinfo.SubjectConfig;
 
 import java.util.ArrayList;
@@ -15,7 +16,7 @@ public class ScanExamInfoVo {
 
     private Config examConfig;
 
-    private List<SubjectConfig> subjectConfig;
+    private List<SubjectConfigVo> subjectConfig;
 
     private AnswerScan answerScan;
 
@@ -101,11 +102,11 @@ public class ScanExamInfoVo {
         this.packageTask = packageTask;
     }
 
-    public List<SubjectConfig> getSubjectConfig() {
+    public List<SubjectConfigVo> getSubjectConfig() {
         return subjectConfig;
     }
 
-    public void setSubjectConfig(List<SubjectConfig> subjectConfig) {
+    public void setSubjectConfig(List<SubjectConfigVo> subjectConfig) {
         this.subjectConfig = subjectConfig;
     }