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 8b6d979..bc72c82 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 @@ -128,6 +128,8 @@ public class ClassScoreServiceImpl implements ClassScoreService { teaClassScoreDto.setSchoolGoodCount(schoolGoodCount); teaClassScoreDto.setSchoolGeneralCount(schoolGeneralCount); teaClassScoreDto.setSchoolFailCount(schoolFailCount); + teaClassScoreDto.setSchoolMaxScore(maxScoreBySchoolId); + teaClassScoreDto.setSchoolMinScore(minScoreBySchoolId); if (teaClassScores.size() > 0) { BigDecimal finalAVGScore = avgScoreBySchoolId.divide(BigDecimal.valueOf(teaClassScores.size()), 2, RoundingMode.HALF_UP); teaClassScoreDto.setClassAverageScore(finalAVGScore); 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 5f32e6f..10e1431 100644 --- a/src/main/java/com/sztzjy/fund_investment/task/Task.java +++ b/src/main/java/com/sztzjy/fund_investment/task/Task.java @@ -38,7 +38,7 @@ public class Task { // 查到单个班级下所有的已经在投资报告页面提交过的学生的总成绩 // 算平均值,存表 //查出所有数据 - List classIdList = performanceScoreMapper.selectClassId(); + List classIdList = performanceScoreMapper.selectClassId(); for (String classId : classIdList) { BigDecimal avgScore = BigDecimal.ZERO; BigDecimal count = BigDecimal.ZERO; @@ -53,12 +53,12 @@ public class Task { gradeCounts.put("fail", 0); BigDecimal classMaxScore = BigDecimal.ZERO; // 最高分,默认为0 BigDecimal classMinScore = null; // 最低分,默认为null - String schoolId =""; + String schoolId = ""; for (PerformanceScore score : performanceScores2) { //第一个比较对象 BigDecimal totalScore = score.getTotalScore(); - if (totalScore==null){ - totalScore=BigDecimal.ZERO; + if (totalScore == null) { + totalScore = BigDecimal.ZERO; } schoolId = score.getSchoolId(); //没提交报告的 算0分跳过 @@ -105,14 +105,14 @@ public class Task { teaClassScore.setGeneralCount(gradeCounts.get("general")); teaClassScore.setFailCount(gradeCounts.get("fail")); teaClassScore.setClassId(classId); - UserExample userTableExample =new UserExample(); + UserExample userTableExample = new UserExample(); userTableExample.createCriteria().andSchoolIdEqualTo(schoolId).andClassIdEqualTo(classId).andRoleIdEqualTo(4); List userTables = userMapper.selectByExample(userTableExample); User userTable = userTables.get(0); teaClassScore.setClassName(userTable.getClassName()); - if (count.compareTo(BigDecimal.ZERO)==0){ + if (count.compareTo(BigDecimal.ZERO) == 0) { teaClassScore.setClassAverageScore(BigDecimal.ZERO); - }else { + } else { BigDecimal divideScore = avgScore.divide(count, 2, RoundingMode.HALF_UP); teaClassScore.setClassAverageScore(divideScore); }