|
|
@ -142,7 +142,7 @@ public class AdminAppraiseServiceImpl implements AdminAppraiseService {
|
|
|
|
Long endTime = timeRangeDto.getEndTime();
|
|
|
|
Long endTime = timeRangeDto.getEndTime();
|
|
|
|
String academicYearId = timeRangeDto.getAcademicYearId();
|
|
|
|
String academicYearId = timeRangeDto.getAcademicYearId();
|
|
|
|
String schoolId = SecurityUtil.getLoginUser().getSchoolId();
|
|
|
|
String schoolId = SecurityUtil.getLoginUser().getSchoolId();
|
|
|
|
String typeName = "";
|
|
|
|
String typeName = null;
|
|
|
|
if (timeRangeDto.getType().equals("moral")) {
|
|
|
|
if (timeRangeDto.getType().equals("moral")) {
|
|
|
|
typeName = "德育";
|
|
|
|
typeName = "德育";
|
|
|
|
}else if (timeRangeDto.getType().equals("labour")){
|
|
|
|
}else if (timeRangeDto.getType().equals("labour")){
|
|
|
|