diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/AdminAppraiseServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/AdminAppraiseServiceImpl.java index 212ff8c..04a2c01 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/AdminAppraiseServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/AdminAppraiseServiceImpl.java @@ -142,6 +142,13 @@ public class AdminAppraiseServiceImpl implements AdminAppraiseService { Long endTime = timeRangeDto.getEndTime(); String academicYearId = timeRangeDto.getAcademicYearId(); String schoolId = SecurityUtil.getLoginUser().getSchoolId(); + String typeName = ""; + if (timeRangeDto.getType().equals("moral")) { + typeName = "德育"; + }else if (timeRangeDto.getType().equals("labour")){ + typeName = "劳育"; + } + // fixme: 是否对时间范围做一些限制(不能确保当前周有数据) // 无参默认当前周 @@ -166,7 +173,7 @@ public class AdminAppraiseServiceImpl implements AdminAppraiseService { startTime, endTime, classIds, - "德育" + typeName ); if (res != null) { diff --git a/src/main/java/cn/teammodel/model/dto/admin/appraise/TimeRangeDto.java b/src/main/java/cn/teammodel/model/dto/admin/appraise/TimeRangeDto.java index ea458ab..f2a5591 100644 --- a/src/main/java/cn/teammodel/model/dto/admin/appraise/TimeRangeDto.java +++ b/src/main/java/cn/teammodel/model/dto/admin/appraise/TimeRangeDto.java @@ -16,4 +16,6 @@ public class TimeRangeDto { @NotNull // todo: 似乎不需要(有时间范围就不需要这个字段来划分时间,如果不传时间那就需要) private String academicYearId; + //教育类型type:'moral', type:'labour' + private String type; }