From 82880ba6bda08118f4c86434f118a7ccee578bc0 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Wed, 6 Nov 2024 10:02:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TopicController.java           | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sztzjy/money_management/controller/TopicController.java b/src/main/java/com/sztzjy/money_management/controller/TopicController.java
index 2e80416..1041d94 100644
--- a/src/main/java/com/sztzjy/money_management/controller/TopicController.java
+++ b/src/main/java/com/sztzjy/money_management/controller/TopicController.java
@@ -19,6 +19,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -130,9 +131,27 @@ public class TopicController {
     @PostMapping("/getObjectiveCountByChapterId")
     @ApiOperation("根据章节查看题目类型数量/模拟认证题库通用")
     @AnonymousAccess
-    private ResultEntity<List<TopicDto>> getObjectiveCountByChapterId(@ApiParam("普通题库/金融智能/银行从业") @RequestParam String outLine,
-                                                                      @RequestParam(required = false) String chapterId) {
-        return new ResultEntity<>(objectiveQuestionMapper.getObjectiveCountByChapterId(outLine, chapterId));
+    private ResultEntity<List<TopicDto>> getObjectiveCountByChapterId(@ApiParam("普通题库/金融智能/银行从业") @RequestParam String outLine) {
+        List<TopicDto> list = new ArrayList<>();
+        if (outLine.equals("金融智能")) {
+            List<TopicDto> list1 = objectiveQuestionMapper.getObjectiveCountByChapterId("金融智能", "13");
+            List<TopicDto> list2 = objectiveQuestionMapper.getObjectiveCountByChapterId("金融智能", "14");
+            list.addAll(list2);
+            list.addAll(list1);
+        }
+        if (outLine.equals("银行从业")) {
+            List<TopicDto> list1 = objectiveQuestionMapper.getObjectiveCountByChapterId("银行从业", "15");
+            List<TopicDto> list2 = objectiveQuestionMapper.getObjectiveCountByChapterId("银行从业", "16");
+            List<TopicDto> list3 = objectiveQuestionMapper.getObjectiveCountByChapterId("银行从业", "17");
+            List<TopicDto> list4 = objectiveQuestionMapper.getObjectiveCountByChapterId("银行从业", "18");
+            List<TopicDto> list5 = objectiveQuestionMapper.getObjectiveCountByChapterId("银行从业", "19");
+            list.addAll(list2);
+            list.addAll(list1);
+            list.addAll(list3);
+            list.addAll(list4);
+            list.addAll(list5);
+        }
+        return new ResultEntity<>(list);
     }
 
 
@@ -148,7 +167,7 @@ public class TopicController {
                                                                                   @RequestParam(required = false) String schoolId,
                                                                                   @RequestParam String chapterId) {
         PageHelper.startPage(index, size);
-        List<ObjectiveQuestionWithBLOBs> list = objectiveQuestionMapper.getObjectiveByType(type, outLine, subClass, content,schoolId,chapterId);
+        List<ObjectiveQuestionWithBLOBs> list = objectiveQuestionMapper.getObjectiveByType(type, outLine, subClass, content, schoolId, chapterId);
         PageInfo pageInfo = new PageInfo(list);
         return new ResultEntity<PageInfo<ObjectiveQuestionWithBLOBs>>(pageInfo);
     }