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 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); } }