From 338a9521b0efd3a1e3540937307fe01809a1b240 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Tue, 27 Feb 2024 10:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88=E7=AB=AF?=
 =?UTF-8?q?=E9=A5=BC=E7=8A=B6=E5=9B=BE=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceImpl/tea/ClassScoreServiceImpl.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 bc72c82..3e1144a 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
@@ -87,6 +87,7 @@ public class ClassScoreServiceImpl implements ClassScoreService {
     public TeaClassScoreDto getClassScoreCount(String schoolId, String classId, Date time) {
         TeaClassScoreExample teaClassScoreExample = new TeaClassScoreExample();
         TeaClassScoreExample.Criteria criteria = teaClassScoreExample.createCriteria();
+        Date startTime = null;
         //班级框为空 统计学校下的所有数据返回
         if (classId == null && schoolId != null) {
             criteria.andSchoolIdEqualTo(schoolId).andStartTimeEqualTo(time);
@@ -122,6 +123,7 @@ public class ClassScoreServiceImpl implements ClassScoreService {
                 }
                 //所有班级平均分累加
                 avgScoreBySchoolId = avgScoreBySchoolId.add(teaClassScore.getClassAverageScore()).setScale(2, RoundingMode.HALF_UP);
+                startTime = teaClassScore.getStartTime();
             }
             TeaClassScoreDto teaClassScoreDto = new TeaClassScoreDto();
             teaClassScoreDto.setSchoolExcellentCount(schoolExcellentCount);
@@ -130,9 +132,10 @@ public class ClassScoreServiceImpl implements ClassScoreService {
             teaClassScoreDto.setSchoolFailCount(schoolFailCount);
             teaClassScoreDto.setSchoolMaxScore(maxScoreBySchoolId);
             teaClassScoreDto.setSchoolMinScore(minScoreBySchoolId);
+            teaClassScoreDto.setStartTime(startTime);
             if (teaClassScores.size() > 0) {
                 BigDecimal finalAVGScore = avgScoreBySchoolId.divide(BigDecimal.valueOf(teaClassScores.size()), 2, RoundingMode.HALF_UP);
-                teaClassScoreDto.setClassAverageScore(finalAVGScore);
+                teaClassScoreDto.setSchoolAverageScore(finalAVGScore);
             }
             return teaClassScoreDto;
         } else {        //选中某个班级返回