From 03e379b49811a13fd59d570e4773b43b06dc422a Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Mon, 25 Dec 2023 10:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E5=87=BA=E6=97=B6?=
 =?UTF-8?q?=E6=9C=BA=E8=A1=A8=EF=BC=8C=E5=AE=8C=E6=88=90=E6=8A=95=E8=B5=84?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TopicController.java            | 18 +++++++++---------
 .../entity/dto/ClassAVGScoreVo.java            |  2 +-
 .../serviceImpl/tea/ClassScoreServiceImpl.java |  5 +++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java b/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java
index 8a9fea3..96e9e76 100644
--- a/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java
+++ b/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java
@@ -53,7 +53,7 @@ public class TopicController {
     @AnonymousAccess
     public ResultEntity<Integer> getRandomTopic(@ApiParam("导入的文件") @RequestParam MultipartFile file,
                                                 @ApiParam("学校ID") @RequestParam String schoolId,
-                                                @ApiParam("知识测评题库,项目尽调题库,项目估值题库,IPO上市板块题目,IPO上市条件题目") @RequestParam String module) {
+                                                @ApiParam("知识测评题库,项目尽调题库,项目估值题库,上市板块相关题库,上市条件相关题库") @RequestParam String module) {
         return new ResultEntity<Integer>(topicService.importFile(file, schoolId, module));
     }
 
@@ -110,7 +110,7 @@ public class TopicController {
 
     /*
      * @author xcj
-     * @Date 2023/11/21
+     * @Date 2023/11/21``
      */
     @GetMapping("getAllScore")
     @ApiOperation("页面回显得分通用接口")
@@ -123,13 +123,13 @@ public class TopicController {
     }
 
 
-    @GetMapping("getIPOTopicOne")
-    @ApiOperation("IPO弹窗1")
-    @AnonymousAccess
-    public ResultEntity<TopicsWithBLOBs> getIPOTopicOne() {
-        TopicsWithBLOBs topics = topicsMapper.selectByPrimaryKey(Constant.NINE);
-        return new ResultEntity<TopicsWithBLOBs>(topics);
-    }
+//    @GetMapping("getIPOTopicOne")
+//    @ApiOperation("IPO弹窗1")
+//    @AnonymousAccess
+//    public ResultEntity<TopicsWithBLOBs> getIPOTopicOne() {
+//        TopicsWithBLOBs topics = topicsMapper.selectByPrimaryKey(Constant.NINE);
+//        return new ResultEntity<TopicsWithBLOBs>(topics);
+//    }
 
 
     @AnonymousAccess
diff --git a/src/main/java/com/sztzjy/fund_investment/entity/dto/ClassAVGScoreVo.java b/src/main/java/com/sztzjy/fund_investment/entity/dto/ClassAVGScoreVo.java
index c415a9e..92d5de9 100644
--- a/src/main/java/com/sztzjy/fund_investment/entity/dto/ClassAVGScoreVo.java
+++ b/src/main/java/com/sztzjy/fund_investment/entity/dto/ClassAVGScoreVo.java
@@ -50,5 +50,5 @@ public class ClassAVGScoreVo {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("最早得分日期")
-    private Date startTime;
+    private List<Date> startTime;
 }
diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java
index 3726cbd..1d7a671 100644
--- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java
+++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java
@@ -65,13 +65,14 @@ public class ClassScoreServiceImpl implements ClassScoreService {
             if (list.isEmpty()) {
                 continue;
             }
-            TeaClassScore teaClassScore = list.get(0);
-            vo.setStartTime(teaClassScore.getStartTime());
             List<BigDecimal> scoreList = new ArrayList();
+            List<Date> dateList = new ArrayList<>();
             for (TeaClassScore classScore : list) {
                 scoreList.add(classScore.getClassAverageScore());
+                dateList.add(classScore.getStartTime());
             }
             vo.setClassAverageScore(scoreList);
+            vo.setStartTime(dateList);
             voList.add(vo);
         }
         return voList;