代码修改

cqb-gen-paper/src/main/java/com/qmth/cqb/genpaper/web/GenPaperController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.qmth.cqb.genpaper.model.GenPaperDto;
 import com.qmth.cqb.genpaper.service.GenPaperService;
+import com.qmth.cqb.utils.enums.RandomGenPaperPolicy;
 
 import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 import io.swagger.annotations.ApiOperation;
@@ -44,17 +45,22 @@ public class GenPaperController {
                 paperMap = genPaperService.genPaperByScore(genPaperDto);
             }
         } else if (genPaperDto.getGenNumber() > 1) {
-            if (genPaperDto.getSimpleGenPaperPolicy().getKey() == 1L) {
+            if (genPaperDto.getSimpleGenPaperPolicy() == RandomGenPaperPolicy.BY_QUESTIONNUM) {
                 for (int i = 1; i <= genPaperDto.getGenNumber(); i++) {
                     genPaperDto.setPaperName(paperName + "_" + i);
                     paperMap.putAll(genPaperService.genPaperByQuestionNum(genPaperDto));
+                    if (!paperMap.get("msg").equals("success")) {
+                        break;
+                    }
                 }
 
-            } else if (genPaperDto.getSimpleGenPaperPolicy().getKey() == 2L) {
+            } else if (genPaperDto.getSimpleGenPaperPolicy() == RandomGenPaperPolicy.BY_SCORE) {
                 for (int i = 1; i <= genPaperDto.getGenNumber(); i++) {
                     genPaperDto.setPaperName(genPaperDto.getPaperName() + "_" + i);
                     paperMap.putAll(genPaperService.genPaperByScore(genPaperDto));
-                    genPaperDto.setPaperName("");
+                    if (!paperMap.get("msg").equals("success")) {
+                        break;
+                    }
                 }
 
             }
@@ -80,6 +86,9 @@ public class GenPaperController {
             for (int i = 1; i <= genPaperDto.getGenNumber(); i++) {
                 genPaperDto.setPaperName(paperName + "_" + i);
                 paperMap.putAll(genPaperService.genPaper(genPaperDto));
+                if (!paperMap.get("msg").equals("success")) {
+                    break;
+                }
             }
         } else if (genPaperDto.getGenNumber() == 1) {
             paperMap = genPaperService.genPaper(genPaperDto);