Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

园历修改

Browse Source
This commit is contained in:
zhanglipeng 2020-11-24 15:14:20 +08:00
parent 19d096df96
commit 5d4bc1d64f
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java
View File

@ -10,9 +10,11 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.benyi.domain.*; import com.ruoyi.project.benyi.domain.*;
import com.ruoyi.project.benyi.service.*; import com.ruoyi.project.benyi.service.*;
import com.ruoyi.project.common.SchoolCommon; 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.ByTeacherJbxx;
import com.ruoyi.project.system.domain.SysDictData; import com.ruoyi.project.system.domain.SysDictData;
import com.ruoyi.project.system.domain.SysUser; 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.IByTeacherJbxxService;
import com.ruoyi.project.system.service.ISysDictDataService; import com.ruoyi.project.system.service.ISysDictDataService;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
@ -61,6 +63,8 @@ public class ByCalendarController extends BaseController {
private IByThemeActivityService byThemeActivityService; private IByThemeActivityService byThemeActivityService;
@Autowired @Autowired
private IByChildService byChildService; private IByChildService byChildService;
@Autowired
private IByClassService byClassService;
/** /**
* 查询园历管理(本一)列表 * 查询园历管理(本一)列表
@ -196,6 +200,14 @@ public class ByCalendarController extends BaseController {
BySchoolcalendar bySchoolcalendar = new BySchoolcalendar(); BySchoolcalendar bySchoolcalendar = new BySchoolcalendar();
//设置幼儿园 //设置幼儿园
bySchoolcalendar.setDeptid(schoolId); bySchoolcalendar.setDeptid(schoolId);
//班级类型
String classId = schoolCommon.getClassId();
if (!schoolCommon.isStringEmpty(classId)) {
ByClass byClass=new ByClass();
byClass=byClassService.selectByClassById(classId);
bySchoolcalendar.setScope(byClass.getBjtype());
}
List<BySchoolcalendar> bySchoolcalendarList = bySchoolcalendarService.selectBySchoolcalendarList(bySchoolcalendar); List<BySchoolcalendar> bySchoolcalendarList = bySchoolcalendarService.selectBySchoolcalendarList(bySchoolcalendar);
if (bySchoolcalendarList.size() > 0) { if (bySchoolcalendarList.size() > 0) {