bug修改

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

@@ -93,7 +93,7 @@ public class ExportPaperController {
     }
     
     @ApiOperation(value="导出试题分布数量", notes="导出试题分布数量")
-    @GetMapping(value = "/paper/course/question/{courseNo}")
+    @GetMapping(value = "/paper/export/course/question/{courseNo}")
     public void downQuestionDistribute(HttpServletResponse response,@PathVariable String courseNo){
     	log.info("开始导出Excel");
     	try {

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ImportPaperService.java

@@ -472,6 +472,8 @@ public class ImportPaperService {
     public void initPaperDetail(Paper paper, PaperDetail paperDetail, PaperDetailUnit paperDetailUnit,
             Question question, int subQuesNum, ImportPaperCheck importPaperCheck) {
 
+    	//重置importPaperCheck
+    	importPaperCheck.nestedHeadNumber = 0;
         question.setQuestionType(getQuesStructType(importPaperCheck.quesType));
         question.setScore(Double.parseDouble(importPaperCheck.quesScore));
         paperDetailUnit.setNumber(subQuesNum);
@@ -1782,14 +1784,17 @@ public class ImportPaperService {
 		String[] quesAnwser = question.getQuesAnswer().split("<span>##");
 		//如果有答案，进行判断
 		if(quesAnwser.length>0){
-			//判断题干空格和答案空格是否相等
-			if((quesBody.length -1) != quesAnwser.length){
-				if(importPaperCheck.nestedHeadNumber == 0){
-            		importPaperCheck.setErrorInfo("[大题名称]："+importPaperCheck.quesName+"第"+subQuesNum+"题中,题干与答案的空格数量不一样");
-            	}else {
-            		importPaperCheck.setErrorInfo("[大题名称]："+importPaperCheck.quesName+"第"+importPaperCheck.nestedHeadNumber+"个套题中,第"+subQuesNum+"题中,题干与答案的空格数量不一样");
+			String str = quesAnwser[0].replaceAll("<p>", "").replaceAll("</p>", "").replaceAll("<span>", "").replaceAll("</span>", "");
+			if(quesAnwser.length == 1 && !StringUtils.isBlank(str) || quesAnwser.length >2){
+				//判断题干空格和答案空格是否相等
+				if((quesBody.length -1) != quesAnwser.length){
+					if(importPaperCheck.nestedHeadNumber == 0){
+	            		importPaperCheck.setErrorInfo("[大题名称]："+importPaperCheck.quesName+"第"+subQuesNum+"题中,题干与答案的空格数量不一样");
+	            	}else {
+	            		importPaperCheck.setErrorInfo("[大题名称]："+importPaperCheck.quesName+"第"+importPaperCheck.nestedHeadNumber+"个套题中,第"+subQuesNum+"题中,题干与答案的空格数量不一样");
+					}
+	            	throw new PaperException(importPaperCheck.errorInfo);
 				}
-            	throw new PaperException(importPaperCheck.errorInfo);
 			}
 		}
 	}