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

园历-一日流程评估计划去掉班级教师登录查看

Browse Source
This commit is contained in:
zhanglipeng 2021-07-26 10:34:42 +08:00
parent 5e3e0524d7
commit 41f333836d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,8 +176,6 @@ public class ByCalendarController extends BaseController {
//根据不同的幼儿园加载幼儿园园历 //根据不同的幼儿园加载幼儿园园历
//(long)207 //(long)207
listvi.addAll(getbySchoolcalendars(schoolId, formatter, hashMap)); listvi.addAll(getbySchoolcalendars(schoolId, formatter, hashMap));
//根据不同的幼儿园加载教职工
listvi.addAll(getbyteacherBiths(schoolId, formatter, hashMap));
} }
// listvi.addAll(getbySchoolcalendars((long)207,formatter,hashMap)); // listvi.addAll(getbySchoolcalendars((long)207,formatter,hashMap));
// listvi.addAll(getbyteacherBiths((long)207,formatter,hashMap)); // listvi.addAll(getbyteacherBiths((long)207,formatter,hashMap));
@ -191,14 +189,17 @@ public class ByCalendarController extends BaseController {
listvi.addAll(getbyclassthemes(classId, formatter, hashMap)); listvi.addAll(getbyclassthemes(classId, formatter, hashMap));
//根据班级加载幼儿生日 //根据班级加载幼儿生日
listvi.addAll(getbychilds(classId, formatter)); listvi.addAll(getbychilds(classId, formatter));
}else{
Long schoolId = SecurityUtils.getLoginUser().getUser().getDeptId();
//幼儿一日流程评估计划
listvi.addAll(getdayflowdata(classId, formatter));
//根据不同的幼儿园加载教职工
listvi.addAll(getbyteacherBiths(schoolId, formatter, hashMap));
} }
//幼儿出勤人数 //幼儿出勤人数
listvi.addAll(getbychildcheckdata(classId, formatter)); listvi.addAll(getbychildcheckdata(classId, formatter));
//幼儿一日流程评估计划
listvi.addAll(getdayflowdata(classId, formatter));
//幼儿园一日流程评估结果 //幼儿园一日流程评估结果
Long userId = SecurityUtils.getLoginUser().getUser().getUserId(); Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
listvi.addAll(getdayflowresult(userId, formatter)); listvi.addAll(getdayflowresult(userId, formatter));