From 30e3c01522f49574e11a32b9e03560c80e72f76b Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Fri, 5 Feb 2021 14:22:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=97=A5=E6=B5=81=E7=A8=8B=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E8=AE=A1=E5=88=92=E5=8A=A0=E5=85=A5=E5=9B=AD=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ByCalendarController.java      | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

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 6d4295f7e..6a9f09d48 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
@@ -67,6 +67,10 @@ public class ByCalendarController extends BaseController {
     private IByClassService byClassService;
     @Autowired
     private IByChildCheckinDetailService byChildCheckinDetailService;
+    @Autowired
+    private IByDayflowassessmentplanService byDayflowassessmentplanService;
+    @Autowired
+    private IByDayFlowDetailService byDayFlowDetailService;
 
     /**
      * 查询园历管理(本一)列表
@@ -188,7 +192,10 @@ public class ByCalendarController extends BaseController {
         }
 
         //幼儿出勤人数
-        listvi.addAll(getbychildcheckdata(classId,formatter));
+        listvi.addAll(getbychildcheckdata(classId, formatter));
+
+        //幼儿一日流程评估计划
+        listvi.addAll(getdayflowdata(classId,formatter));
 
         AjaxResult ajax = AjaxResult.success();
         ajax.put("calendarData", listvi);
@@ -418,7 +425,7 @@ public class ByCalendarController extends BaseController {
                 by = new ByCalendarShow();
                 ByChildCheckinDetail byNewChildCheckinDetail = list.get(i);
 
-                by.setTitle("幼儿出勤人数："+byNewChildCheckinDetail.getCount());
+                by.setTitle("幼儿出勤人数：" + byNewChildCheckinDetail.getCount());
                 String timefor = formatter.format(byNewChildCheckinDetail.getCreateTime());
                 by.setStart(timefor);
                 by.setEnd(timefor);
@@ -429,4 +436,30 @@ public class ByCalendarController extends BaseController {
         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;
+    }
+
 }