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