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

一日流程评估计划加入园历

Browse Source
This commit is contained in:
zhanglipeng 2021-02-05 14:22:17 +08:00
parent 865528266d
commit 30e3c01522
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,10 @@ public class ByCalendarController extends BaseController {
private IByClassService byClassService; private IByClassService byClassService;
@Autowired @Autowired
private IByChildCheckinDetailService byChildCheckinDetailService; private IByChildCheckinDetailService byChildCheckinDetailService;
@Autowired
private IByDayflowassessmentplanService byDayflowassessmentplanService;
@Autowired
private IByDayFlowDetailService byDayFlowDetailService;
/** /**
* 查询园历管理(本一)列表 * 查询园历管理(本一)列表
@ -190,6 +194,9 @@ public class ByCalendarController extends BaseController {
//幼儿出勤人数 //幼儿出勤人数
listvi.addAll(getbychildcheckdata(classId, formatter)); listvi.addAll(getbychildcheckdata(classId, formatter));
//幼儿一日流程评估计划
listvi.addAll(getdayflowdata(classId,formatter));
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ajax.put("calendarData", listvi); ajax.put("calendarData", listvi);
return ajax; return ajax;
@ -429,4 +436,30 @@ public class ByCalendarController extends BaseController {
return listvi; return listvi;
} }
//获取学校或班级一日流程评估
private List<ByCalendarShow> getdayflowdata(String classId, SimpleDateFormat formatter) {
List<ByCalendarShow> listvi = new ArrayList<>();
Long deptId = SecurityUtils.getLoginUser().getUser().getDept().getDeptId();
ByDayflowassessmentplan byDayflowassessmentplan = new ByDayflowassessmentplan();
byDayflowassessmentplan.setDeptId(deptId);
byDayflowassessmentplan.setClassid(classId);
List<ByDayflowassessmentplan> list = byDayflowassessmentplanService.selectByDayflowassessmentplanList(byDayflowassessmentplan);
if (list != null && list.size() > 0) {
ByCalendarShow by = null;
for (int i = 0; i < list.size(); i++) {
by = new ByCalendarShow();
ByDayflowassessmentplan byNewDayflowassessmentplan = list.get(i);
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");//设置日期格式
by.setTitle(sdf.format(byNewDayflowassessmentplan.getStarttime()) +"评估"+ byClassService.selectByClassById(byNewDayflowassessmentplan.getClassid()).getBjmc() + byDayFlowDetailService.selectByDayFlowDetailById(Long.valueOf(byNewDayflowassessmentplan.getConnent())).getName());
String timefor = formatter.format(byNewDayflowassessmentplan.getStarttime());
by.setStart(timefor);
by.setEnd(timefor);
by.setColor("#1890ff");
listvi.add(by);
}
}
return listvi;
}
} }