From 56fd60a4cf6837629e9c587c946ed2fb948fbf1f Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Thu, 17 Dec 2020 17:06:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=AD=E5=8E=86=E5=B1=95=E7=A4=BA=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B9=BC=E5=84=BF=E8=80=83=E5=8B=A4=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ByCalendarController.java | 35 ++++++++++++++- .../benyi/domain/ByChildCheckinDetail.java | 7 +++ .../mapper/ByChildCheckinDetailMapper.java | 8 ++++ .../service/IByChildCheckinDetailService.java | 9 ++++ .../impl/ByChildCheckinDetailServiceImpl.java | 43 +++++++++++-------- .../benyi/ByChildCheckinDetailMapper.xml | 12 ++++++ 6 files changed, 93 insertions(+), 21 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 fec6b633e..6d4295f7e 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 @@ -65,6 +65,8 @@ public class ByCalendarController extends BaseController { private IByChildService byChildService; @Autowired private IByClassService byClassService; + @Autowired + private IByChildCheckinDetailService byChildCheckinDetailService; /** * 查询园历管理(本一)列表 @@ -185,6 +187,9 @@ public class ByCalendarController extends BaseController { listvi.addAll(getbychilds(classId, formatter)); } + //幼儿出勤人数 + listvi.addAll(getbychildcheckdata(classId,formatter)); + AjaxResult ajax = AjaxResult.success(); ajax.put("calendarData", listvi); return ajax; @@ -203,8 +208,8 @@ public class ByCalendarController extends BaseController { //班级类型 String classId = schoolCommon.getClassId(); if (!schoolCommon.isStringEmpty(classId)) { - ByClass byClass=new ByClass(); - byClass=byClassService.selectByClassById(classId); + ByClass byClass = new ByClass(); + byClass = byClassService.selectByClassById(classId); bySchoolcalendar.setScope(byClass.getBjtype()); } @@ -398,4 +403,30 @@ public class ByCalendarController extends BaseController { return listvi; } + //获取学校或班级考勤数据列表 + private List getbychildcheckdata(String classId, SimpleDateFormat formatter) { + List listvi = new ArrayList<>(); + + Long deptId = SecurityUtils.getLoginUser().getUser().getDept().getDeptId(); + ByChildCheckinDetail byChildCheckinDetail = new ByChildCheckinDetail(); + byChildCheckinDetail.setSchoolid(deptId); + byChildCheckinDetail.setClassid(classId); + List list = byChildCheckinDetailService.selectByChildCheckinGroupDaysList(byChildCheckinDetail); + if (list != null && list.size() > 0) { + ByCalendarShow by = null; + for (int i = 0; i < list.size(); i++) { + by = new ByCalendarShow(); + ByChildCheckinDetail byNewChildCheckinDetail = list.get(i); + + by.setTitle("幼儿出勤人数："+byNewChildCheckinDetail.getCount()); + String timefor = formatter.format(byNewChildCheckinDetail.getCreateTime()); + by.setStart(timefor); + by.setEnd(timefor); + by.setColor("#85a5ff"); + listvi.add(by); + } + } + return listvi; + } + } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildCheckinDetail.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildCheckinDetail.java index 5bded3ff8..0fbea609f 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildCheckinDetail.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildCheckinDetail.java @@ -55,6 +55,8 @@ public class ByChildCheckinDetail extends BaseEntity { @Excel(name = "创建人") private Long createuserid; + private int count; + public void setId(Long id) { this.id = id; } @@ -111,6 +113,10 @@ public class ByChildCheckinDetail extends BaseEntity { return createuserid; } + public void setCount(int count){this.count=count;} + + public int getCount(){return count;} + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -122,6 +128,7 @@ public class ByChildCheckinDetail extends BaseEntity { .append("type", getType()) .append("createuserid", getCreateuserid()) .append("createTime", getCreateTime()) + .append("count", getCount()) .toString(); } } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByChildCheckinDetailMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByChildCheckinDetailMapper.java index 0fe5b83d4..dc45e7cea 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByChildCheckinDetailMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByChildCheckinDetailMapper.java @@ -27,6 +27,14 @@ public interface ByChildCheckinDetailMapper { */ public List selectByChildCheckinDetailList(ByChildCheckinDetail byChildCheckinDetail); + /** + * 查询幼儿考勤列表根据每天进行分组 + * + * @param byChildCheckinDetail 幼儿考勤 + * @return 幼儿考勤集合 + */ + public List selectByChildCheckinGroupDaysList(ByChildCheckinDetail byChildCheckinDetail); + /** * 新增幼儿考勤 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByChildCheckinDetailService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByChildCheckinDetailService.java index f266b8413..32593f8cf 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByChildCheckinDetailService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByChildCheckinDetailService.java @@ -27,6 +27,15 @@ public interface IByChildCheckinDetailService */ public List selectByChildCheckinDetailList(ByChildCheckinDetail byChildCheckinDetail); + /** + * 查询幼儿考勤列表根据每天进行分组 + * + * @param byChildCheckinDetail 幼儿考勤 + * @return 幼儿考勤集合 + */ + public List selectByChildCheckinGroupDaysList(ByChildCheckinDetail byChildCheckinDetail); + + /** * 新增幼儿考勤 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByChildCheckinDetailServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByChildCheckinDetailServiceImpl.java index b56dcb638..c2243f81a 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByChildCheckinDetailServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByChildCheckinDetailServiceImpl.java @@ -1,8 +1,9 @@ package com.ruoyi.project.benyi.service.impl; import java.util.List; - import com.ruoyi.common.utils.DateUtils; - import org.springframework.beans.factory.annotation.Autowired; + +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.project.benyi.mapper.ByChildCheckinDetailMapper; import com.ruoyi.project.benyi.domain.ByChildCheckinDetail; @@ -15,8 +16,7 @@ import com.ruoyi.project.benyi.service.IByChildCheckinDetailService; * @date 2020-07-21 */ @Service -public class ByChildCheckinDetailServiceImpl implements IByChildCheckinDetailService -{ +public class ByChildCheckinDetailServiceImpl implements IByChildCheckinDetailService { @Autowired private ByChildCheckinDetailMapper byChildCheckinDetailMapper; @@ -27,8 +27,7 @@ public class ByChildCheckinDetailServiceImpl implements IByChildCheckinDetailSer * @return 幼儿考勤 */ @Override - public ByChildCheckinDetail selectByChildCheckinDetailById(Long id) - { + public ByChildCheckinDetail selectByChildCheckinDetailById(Long id) { return byChildCheckinDetailMapper.selectByChildCheckinDetailById(id); } @@ -39,11 +38,21 @@ public class ByChildCheckinDetailServiceImpl implements IByChildCheckinDetailSer * @return 幼儿考勤 */ @Override - public List selectByChildCheckinDetailList(ByChildCheckinDetail byChildCheckinDetail) - { + public List selectByChildCheckinDetailList(ByChildCheckinDetail byChildCheckinDetail) { return byChildCheckinDetailMapper.selectByChildCheckinDetailList(byChildCheckinDetail); } + /** + * 查询幼儿考勤列表根据每天进行分组 + * + * @param byChildCheckinDetail 幼儿考勤 + * @return 幼儿考勤集合 + */ + @Override + public List selectByChildCheckinGroupDaysList(ByChildCheckinDetail byChildCheckinDetail) { + return byChildCheckinDetailMapper.selectByChildCheckinGroupDaysList(byChildCheckinDetail); + } + /** * 新增幼儿考勤 * @@ -51,10 +60,9 @@ public class ByChildCheckinDetailServiceImpl implements IByChildCheckinDetailSer * @return 结果 */ @Override - public int insertByChildCheckinDetail(ByChildCheckinDetail byChildCheckinDetail) - { - byChildCheckinDetail.setCreateTime(DateUtils.getNowDate()); - return byChildCheckinDetailMapper.insertByChildCheckinDetail(byChildCheckinDetail); + public int insertByChildCheckinDetail(ByChildCheckinDetail byChildCheckinDetail) { + byChildCheckinDetail.setCreateTime(DateUtils.getNowDate()); + return byChildCheckinDetailMapper.insertByChildCheckinDetail(byChildCheckinDetail); } /** @@ -64,9 +72,8 @@ public class ByChildCheckinDetailServiceImpl implements IByChildCheckinDetailSer * @return 结果 */ @Override - public int updateByChildCheckinDetail(ByChildCheckinDetail byChildCheckinDetail) - { - return byChildCheckinDetailMapper.updateByChildCheckinDetail(byChildCheckinDetail); + public int updateByChildCheckinDetail(ByChildCheckinDetail byChildCheckinDetail) { + return byChildCheckinDetailMapper.updateByChildCheckinDetail(byChildCheckinDetail); } /** @@ -76,8 +83,7 @@ public class ByChildCheckinDetailServiceImpl implements IByChildCheckinDetailSer * @return 结果 */ @Override - public int deleteByChildCheckinDetailByIds(Long[] ids) - { + public int deleteByChildCheckinDetailByIds(Long[] ids) { return byChildCheckinDetailMapper.deleteByChildCheckinDetailByIds(ids); } @@ -88,8 +94,7 @@ public class ByChildCheckinDetailServiceImpl implements IByChildCheckinDetailSer * @return 结果 */ @Override - public int deleteByChildCheckinDetailById(Long id) - { + public int deleteByChildCheckinDetailById(Long id) { return byChildCheckinDetailMapper.deleteByChildCheckinDetailById(id); } } diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByChildCheckinDetailMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByChildCheckinDetailMapper.xml index 78585a486..c9e31328e 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByChildCheckinDetailMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByChildCheckinDetailMapper.xml @@ -13,6 +13,7 @@ + @@ -33,6 +34,17 @@ + +