组卷名称修改

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/GenPaperController.java

@@ -109,11 +109,21 @@ public class GenPaperController extends ControllerSupport {
         String paperName = genPaperDto.getPaperName();
         //判断试卷名称是否一样
         try {
-			boolean result;
-			result = paperService.checkPaperName(paperName, PaperType.GENERATE,user.getRootOrgId()+"");
-			if(!result){
-				String msg = "考试试卷:"+paperName+"已经存在";
-				paperMap.put("msg", msg);
+        	//判断试卷名称是否一样
+        	boolean result = false;
+        	if(genPaperDto.getGenNumber() > 1){
+        		for(int i = 1; i <= genPaperDto.getGenNumber(); i++){
+					genPaperDto.setPaperName(paperName + "_" + i);
+					result = paperService.checkPaperName(genPaperDto.getPaperName(), PaperType.GENERATE,user.getRootOrgId()+"");
+					if(!result){
+						paperMap.put("msg", "考试试卷:"+genPaperDto.getPaperName()+"已经存在");
+			            return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+					}
+				}
+        	}
+        	result = paperService.checkPaperName(genPaperDto.getPaperName(), PaperType.GENERATE,user.getRootOrgId()+"");
+        	if(!result){
+				paperMap.put("msg", "考试试卷:"+genPaperDto.getPaperName()+"已经存在");
 	            return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
 			}
 		} catch (Exception e) {
@@ -149,11 +159,21 @@ public class GenPaperController extends ControllerSupport {
         String paperName = genPaperDto.getPaperName();
         //判断试卷名称是否一样
 		try {
-			boolean result;
-			result = paperService.checkPaperName(paperName, PaperType.GENERATE,user.getRootOrgId()+"");
-			if(!result){
-				String msg = "考试试卷:"+paperName+"已经存在";
-				paperMap.put("msg", msg);
+			//判断试卷名称是否一样
+        	boolean result = false;
+        	if(genPaperDto.getGenNumber() > 1){
+        		for(int i = 1; i <= genPaperDto.getGenNumber(); i++){
+					genPaperDto.setPaperName(paperName + "_" + i);
+					result = paperService.checkPaperName(genPaperDto.getPaperName(), PaperType.GENERATE,user.getRootOrgId()+"");
+					if(!result){
+						paperMap.put("msg", "考试试卷:"+genPaperDto.getPaperName()+"已经存在");
+			            return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+					}
+				}
+        	}
+        	result = paperService.checkPaperName(genPaperDto.getPaperName(), PaperType.GENERATE,user.getRootOrgId()+"");
+        	if(!result){
+				paperMap.put("msg", "考试试卷:"+genPaperDto.getPaperName()+"已经存在");
 	            return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
 			}
 		} catch (Exception e) {