修改更新题目的接口，试卷选项识别时增加<p>标签

src/main/java/com/yaoxiang/diagnosis/controller/QuestionController.java

@@ -31,25 +31,25 @@ public class QuestionController {
     @Resource
     private ExecutorService executorService;
 
-    @ApiOperation(value = "增加 试题")
+    @ApiOperation(value = "增加 题目")
     @RequestMapping(value = "/addQuestionForPaper", method = RequestMethod.POST)
     public Result addQuestionForPaper(@RequestBody Question question) {
         return questionService.addQuestion(question);
     }
 
-    @ApiOperation(value = "修改 试题")
+    @ApiOperation(value = "修改 题目")
     @RequestMapping(value = "/updateQuestionForPaper", method = RequestMethod.POST)
     public Result updateQuestionForPaper(@RequestBody Question question) {
         return questionService.updateQuestion(question);
     }
 
-    @ApiOperation(value = "查询 试题  ")
+    @ApiOperation(value = "查询 题目  ")
     @RequestMapping(value = "/getQuestion", method = RequestMethod.GET)
     public Question getQuestion(@RequestParam Long id) {
         return questionService.getQuestion(id);
     }
 
-    @ApiOperation(value = "删除 试题  ")
+    @ApiOperation(value = "删除 题目  ")
     @RequestMapping(value = "/deleteQuestion", method = RequestMethod.GET)
     public void deleteQuestion(@RequestParam Long id) {
         questionService.deleteQuestion(id);

src/main/java/com/yaoxiang/diagnosis/service/OptionService.java

@@ -31,7 +31,8 @@ public class OptionService {
         }
         option.setUpdatetime(new Date());
         option.setCreatetime(new Date());
-        return new Result(optionRepo.save(option) != null);
+        optionRepo.save(option);
+        return Result.ok();
     }
 
     public Result updateOption(QuestionOption option) {
@@ -42,7 +43,8 @@ public class OptionService {
             return new Result(false, "编辑选项不能没有题目id");
         }
         option.setUpdatetime(new Date());
-        return new Result(optionRepo.saveAndFlush(option) != null);
+        optionRepo.saveAndFlush(option);
+        return Result.ok();
     }
 
     public List<QuestionOption> listOptionByQuestion(Question question) {

src/main/java/com/yaoxiang/diagnosis/service/QuestionService.java

@@ -49,7 +49,7 @@ public class QuestionService {
     public Result updateQuestion(Question question) {
         Long id = question.getId();
         if (id == null) {
-            return new Result(false);
+            return Result.fail("未找到该题目Id");
         }
         question.setUpdatetime(new Date());
         for (QuestionOption option : question.getOptions()) {
@@ -65,7 +65,8 @@ public class QuestionService {
                 }
             }
         }
-        return new Result(questionRepo.saveAndFlush(question) != null);
+        questionRepo.saveAndFlush(question);
+        return Result.ok();
     }
 
     public List<Question> listQuestionByPaper(Paper paper) {

src/main/java/com/yaoxiang/diagnosis/service/SpecialReportService.java

@@ -238,35 +238,25 @@ public class SpecialReportService {
             mind.setQuestionNum(qidss.length);
 
             for (String s : qidss) {
+                int number = 0;
                 if (s.matches("\\d+[A-E]")) {
                     Matcher matcher = pattern.matcher(s);
-                    int number = 0;
                     if (matcher.find()) {
                         number = Integer.parseInt(matcher.group());
                     } else {
                         logger.error("未检测到题号，qids={}", qids);
                         continue;
                     }
-                    if(map.containsKey(number) && StringUtils.isBlank(map.get(number))){
-                        //没做题
-                        mind.setCollectNum(mind.getCollectNum() - 1);
-                    }else if (map.containsKey(number)) {
-                        String options = map.get(number);
-                        if (s.contains(options)) {
-                            mind.setCollectNum(mind.getCollectNum() - 1);
-                        }
-                    }
                 } else {
-                    int number = Integer.parseInt(s);
-                    if (map.containsKey(number) && StringUtils.isBlank(map.get(number))) {
-                        //没做题
+                    number = Integer.parseInt(s);
+                }
+                if (map.containsKey(number) && StringUtils.isBlank(map.get(number))) {
+                    //没做题
+                    mind.setCollectNum(mind.getCollectNum() - 1);
+                } else if (map.containsKey(number)) {
+                    String options = map.get(number);
+                    if (s.contains(options)) {
                         mind.setCollectNum(mind.getCollectNum() - 1);
-                    } else if (map.containsKey(number)) {
-                        //答错了
-                        String options = map.get(number);
-                        if (s.contains(options)) {
-                            mind.setCollectNum(mind.getCollectNum() - 1);
-                        }
                     }
                 }
             }

src/main/java/com/yaoxiang/diagnosis/word/WordService.java

@@ -257,7 +257,7 @@ public class WordService {
         QuestionOption option = new QuestionOption();
         option.setOindex(index);
         //去掉选项中的#A#
-        option.setContent(content.substring(3));
+        option.setContent("<p>" + content.substring(3) + "</p>");
         option.setCreatetime(new Date());
         option.setCorrect(false);
         return option;