修改组卷试卷同名的bug

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

@@ -15,6 +15,8 @@ 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.paper.service.PaperService;
+import com.qmth.cqb.utils.enums.PaperType;
 import com.qmth.cqb.utils.enums.RandomGenPaperPolicy;
 
 import cn.com.qmth.examcloud.common.uac.annotation.Uac;
@@ -32,6 +34,9 @@ public class GenPaperController {
 
     @Autowired
     GenPaperService genPaperService;
+    
+    @Autowired
+    PaperService paperService;
 
     @ApiOperation(value = "简易随机组卷", notes = "简易随机组卷")
     @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
@@ -42,6 +47,18 @@ public class GenPaperController {
         genPaperDto.setCreator(user.getName());
         Map<String, Object> paperMap = new HashMap<String, Object>();
         String paperName = genPaperDto.getPaperName();
+        //判断试卷名称是否一样
+        try {
+			boolean result;
+			result = paperService.checkPaperName(paperName, PaperType.GENERATE,user.getRootOrgId()+"");
+			if(!result){
+				String msg = "考试试卷:"+paperName+"已经存在";
+				paperMap.put("msg", msg);
+	            return new ResponseEntity(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+			}
+		} catch (Exception e) {
+			return new ResponseEntity(e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
+		}
         if (genPaperDto.getGenNumber() == 1) {
             if (genPaperDto.getSimpleGenPaperPolicy().getKey() == 1L) {
                 paperMap = genPaperService.genPaperByQuestionNum(genPaperDto);
@@ -87,6 +104,18 @@ public class GenPaperController {
         genPaperDto.setCreator(user.getName());
         Map<String, Object> paperMap = new HashMap<String, Object>();
         String paperName = genPaperDto.getPaperName();
+        //判断试卷名称是否一样
+        try {
+			boolean result;
+			result = paperService.checkPaperName(paperName, PaperType.GENERATE,user.getRootOrgId()+"");
+			if(!result){
+				String msg = "考试试卷:"+paperName+"已经存在";
+				paperMap.put("msg", msg);
+	            return new ResponseEntity(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+			}
+		} catch (Exception e) {
+			return new ResponseEntity(e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
+		}
         if (genPaperDto.getGenNumber() > 1) {
             for (int i = 1; i <= genPaperDto.getGenNumber(); i++) {
                 genPaperDto.setPaperName(paperName + "_" + i);