修改老师端饼状图接口返回格式

master
xiaoCJ 1 year ago
parent c382c64818
commit 1e269eb149

@ -128,6 +128,8 @@ public class ClassScoreServiceImpl implements ClassScoreService {
teaClassScoreDto.setSchoolGoodCount(schoolGoodCount); teaClassScoreDto.setSchoolGoodCount(schoolGoodCount);
teaClassScoreDto.setSchoolGeneralCount(schoolGeneralCount); teaClassScoreDto.setSchoolGeneralCount(schoolGeneralCount);
teaClassScoreDto.setSchoolFailCount(schoolFailCount); teaClassScoreDto.setSchoolFailCount(schoolFailCount);
teaClassScoreDto.setSchoolMaxScore(maxScoreBySchoolId);
teaClassScoreDto.setSchoolMinScore(minScoreBySchoolId);
if (teaClassScores.size() > 0) { if (teaClassScores.size() > 0) {
BigDecimal finalAVGScore = avgScoreBySchoolId.divide(BigDecimal.valueOf(teaClassScores.size()), 2, RoundingMode.HALF_UP); BigDecimal finalAVGScore = avgScoreBySchoolId.divide(BigDecimal.valueOf(teaClassScores.size()), 2, RoundingMode.HALF_UP);
teaClassScoreDto.setClassAverageScore(finalAVGScore); teaClassScoreDto.setClassAverageScore(finalAVGScore);

@ -38,7 +38,7 @@ public class Task {
// 查到单个班级下所有的已经在投资报告页面提交过的学生的总成绩 // 查到单个班级下所有的已经在投资报告页面提交过的学生的总成绩
// 算平均值,存表 // 算平均值,存表
//查出所有数据 //查出所有数据
List<String> classIdList = performanceScoreMapper.selectClassId(); List<String> classIdList = performanceScoreMapper.selectClassId();
for (String classId : classIdList) { for (String classId : classIdList) {
BigDecimal avgScore = BigDecimal.ZERO; BigDecimal avgScore = BigDecimal.ZERO;
BigDecimal count = BigDecimal.ZERO; BigDecimal count = BigDecimal.ZERO;
@ -53,12 +53,12 @@ public class Task {
gradeCounts.put("fail", 0); gradeCounts.put("fail", 0);
BigDecimal classMaxScore = BigDecimal.ZERO; // 最高分默认为0 BigDecimal classMaxScore = BigDecimal.ZERO; // 最高分默认为0
BigDecimal classMinScore = null; // 最低分默认为null BigDecimal classMinScore = null; // 最低分默认为null
String schoolId =""; String schoolId = "";
for (PerformanceScore score : performanceScores2) { for (PerformanceScore score : performanceScores2) {
//第一个比较对象 //第一个比较对象
BigDecimal totalScore = score.getTotalScore(); BigDecimal totalScore = score.getTotalScore();
if (totalScore==null){ if (totalScore == null) {
totalScore=BigDecimal.ZERO; totalScore = BigDecimal.ZERO;
} }
schoolId = score.getSchoolId(); schoolId = score.getSchoolId();
//没提交报告的 算0分跳过 //没提交报告的 算0分跳过
@ -105,14 +105,14 @@ public class Task {
teaClassScore.setGeneralCount(gradeCounts.get("general")); teaClassScore.setGeneralCount(gradeCounts.get("general"));
teaClassScore.setFailCount(gradeCounts.get("fail")); teaClassScore.setFailCount(gradeCounts.get("fail"));
teaClassScore.setClassId(classId); teaClassScore.setClassId(classId);
UserExample userTableExample =new UserExample(); UserExample userTableExample = new UserExample();
userTableExample.createCriteria().andSchoolIdEqualTo(schoolId).andClassIdEqualTo(classId).andRoleIdEqualTo(4); userTableExample.createCriteria().andSchoolIdEqualTo(schoolId).andClassIdEqualTo(classId).andRoleIdEqualTo(4);
List<User> userTables = userMapper.selectByExample(userTableExample); List<User> userTables = userMapper.selectByExample(userTableExample);
User userTable = userTables.get(0); User userTable = userTables.get(0);
teaClassScore.setClassName(userTable.getClassName()); teaClassScore.setClassName(userTable.getClassName());
if (count.compareTo(BigDecimal.ZERO)==0){ if (count.compareTo(BigDecimal.ZERO) == 0) {
teaClassScore.setClassAverageScore(BigDecimal.ZERO); teaClassScore.setClassAverageScore(BigDecimal.ZERO);
}else { } else {
BigDecimal divideScore = avgScore.divide(count, 2, RoundingMode.HALF_UP); BigDecimal divideScore = avgScore.divide(count, 2, RoundingMode.HALF_UP);
teaClassScore.setClassAverageScore(divideScore); teaClassScore.setClassAverageScore(divideScore);
} }

Loading…
Cancel
Save