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

master
xiaoCJ 1 year ago
parent 1e269eb149
commit 338a9521b0

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

Loading…
Cancel
Save