update

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/ExamStructureServiceImpl.java

@@ -95,11 +95,15 @@ public class ExamStructureServiceImpl implements ExamStructureService {
         Check.isNull(questionStructure.getMultipleChoiceTotal(), "多选题数量不能为空！");
         Check.isNull(questionStructure.getBoolQuestionTotal(), "判断题数量不能为空！");
 
-        ExamStructure entity = ExamStructureConvert.of(info);
-
+        ExamStructure structure = ExamStructureConvert.of(info);
+        ExamStructure oldEntity = examStructureRepository.findByOrgIdAndExamId(info.getOrgId(), info.getExamId());
+        if (structure != null) {
+            //已存在则修改
+            structure.setId(oldEntity.getId());
+        }
         //默认为"传统考试"类型
-        entity.setExamType(ExamType.TRADITION.name());
-        examStructureRepository.save(entity);
+        structure.setExamType(ExamType.TRADITION.name());
+        examStructureRepository.save(structure);
     }
 
     @Override

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/CoursePaperServiceTest.java

@@ -8,12 +8,15 @@
 package cn.com.qmth.examcloud.core.print.test;
 
 import cn.com.qmth.examcloud.core.print.entity.CoursePaper;
+import cn.com.qmth.examcloud.core.print.entity.ExamQuestionStructure;
 import cn.com.qmth.examcloud.core.print.entity.ObjectiveQuestionStructure;
 import cn.com.qmth.examcloud.core.print.service.CoursePaperService;
 import cn.com.qmth.examcloud.core.print.service.ExamQuestionStructureService;
+import cn.com.qmth.examcloud.core.print.service.ExamStructureService;
 import cn.com.qmth.examcloud.core.print.service.StatisticService;
 import cn.com.qmth.examcloud.core.print.service.bean.coursepaper.ExportAllReq;
 import cn.com.qmth.examcloud.core.print.service.bean.coursepaper.ExportBatchReq;
+import cn.com.qmth.examcloud.core.print.service.bean.examstructure.ExamStructureInfo;
 import com.google.common.collect.Lists;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +32,8 @@ public class CoursePaperServiceTest extends BaseTest {
     @Autowired
     private ExamQuestionStructureService examQuestionStructureService;
     @Autowired
+    private ExamStructureService examStructureService;
+    @Autowired
     private CoursePaperService coursePaperService;
     @Autowired
     private StatisticService statisticService;
@@ -90,7 +95,19 @@ public class CoursePaperServiceTest extends BaseTest {
     }
 
     @Test
-    public void dd() {
+    public void getQuestionStructureListTest() {
+        ExamStructureInfo examStructure = new ExamStructureInfo();
+        examStructure.setOrgId(orgId);
+        examStructure.setOrgName("启明泰和");
+        examStructure.setExamId(examId);
+        examStructure.setExamName("测试考试");
+        ExamQuestionStructure questionStructure = new ExamQuestionStructure();
+        questionStructure.setSingleChoiceTotal(10);
+        questionStructure.setMultipleChoiceTotal(10);
+        questionStructure.setBoolQuestionTotal(10);
+        examStructure.setQuestionStructure(questionStructure);
+        //examStructureService.saveExamStructure(examStructure);
+
         final String paperId = "5bbc422def8fce44c27cfecf";
         List<ObjectiveQuestionStructure> objectives = examQuestionStructureService.getObjectiveQuestionStructureList(orgId, examId, paperId, paperType);
         System.out.println(jsonMapper.toJson(objectives));