From 5d4bc1d64fd2d8936b28078d1bcf170dec71f80d Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Tue, 24 Nov 2020 15:14:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=AD=E5=8E=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../benyi/controller/ByCalendarController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java index e098f839c..fec6b633e 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java @@ -10,9 +10,11 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.project.benyi.domain.*; import com.ruoyi.project.benyi.service.*; import com.ruoyi.project.common.SchoolCommon; +import com.ruoyi.project.system.domain.ByClass; import com.ruoyi.project.system.domain.ByTeacherJbxx; import com.ruoyi.project.system.domain.SysDictData; import com.ruoyi.project.system.domain.SysUser; +import com.ruoyi.project.system.service.IByClassService; import com.ruoyi.project.system.service.IByTeacherJbxxService; import com.ruoyi.project.system.service.ISysDictDataService; import org.springframework.security.access.prepost.PreAuthorize; @@ -61,6 +63,8 @@ public class ByCalendarController extends BaseController { private IByThemeActivityService byThemeActivityService; @Autowired private IByChildService byChildService; + @Autowired + private IByClassService byClassService; /** * 查询园历管理(本一)列表 @@ -196,6 +200,14 @@ public class ByCalendarController extends BaseController { BySchoolcalendar bySchoolcalendar = new BySchoolcalendar(); //设置幼儿园 bySchoolcalendar.setDeptid(schoolId); + //班级类型 + String classId = schoolCommon.getClassId(); + if (!schoolCommon.isStringEmpty(classId)) { + ByClass byClass=new ByClass(); + byClass=byClassService.selectByClassById(classId); + bySchoolcalendar.setScope(byClass.getBjtype()); + } + List bySchoolcalendarList = bySchoolcalendarService.selectBySchoolcalendarList(bySchoolcalendar); if (bySchoolcalendarList.size() > 0) {