From a0da41015ae7128c6dea981b01e7152f30040f8d Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Fri, 15 Dec 2023 15:00:59 +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

---
 .../com/sztzjy/fund_investment/task/Task.java | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/sztzjy/fund_investment/task/Task.java b/src/main/java/com/sztzjy/fund_investment/task/Task.java
index 0eb6d6c..7bc4344 100644
--- a/src/main/java/com/sztzjy/fund_investment/task/Task.java
+++ b/src/main/java/com/sztzjy/fund_investment/task/Task.java
@@ -64,7 +64,15 @@ public class Task {
             for (PerformanceScore score : performanceScores2) {
                 //第一个比较对象
                 BigDecimal totalScore = score.getTotalScore();
+                if (totalScore==null){
+                    totalScore=BigDecimal.ZERO;
+                }
                 schoolId = score.getSchoolId();
+                //没提交报告的 算0分跳过
+                if (score.getInvestmentReportScore() == null || score.getInvestmentReportScore().equals(BigDecimal.ZERO)) {
+                    continue;
+                }
+
                 // 计算最高分
                 if (totalScore.compareTo(classMaxScore) >= 0) {
                     classMaxScore = totalScore;
@@ -74,10 +82,6 @@ public class Task {
                     classMinScore = totalScore;
                 }
 
-                //没提交报告的 算0分跳过
-                if (score.getInvestmentReportScore() == null || score.getInvestmentReportScore().equals(BigDecimal.ZERO)) {
-                    continue;
-                }
                 count = count.add(BigDecimal.ONE);
                 avgScore = avgScore.add(totalScore);
 
@@ -111,8 +115,12 @@ public class Task {
             List<User> userTables = userMapper.selectByExample(userTableExample);
             User userTable = userTables.get(0);
             teaClassScore.setClassName(userTable.getClassName());
-            BigDecimal divideScore = avgScore.divide(count, 2, RoundingMode.HALF_UP);
-            teaClassScore.setClassAverageScore(divideScore);
+            if (count.compareTo(BigDecimal.ZERO)==0){
+                teaClassScore.setClassAverageScore(BigDecimal.ZERO);
+            }else {
+                BigDecimal divideScore = avgScore.divide(count, 2, RoundingMode.HALF_UP);
+                teaClassScore.setClassAverageScore(divideScore);
+            }
             teaClassScoreMapper.insert(teaClassScore);
         }
     }