diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java index e4bdf552..815ebf96 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java @@ -122,7 +122,8 @@ public class ProjectAttendanceController extends BaseController { where.setPrjIds(getProjectIds()); } } - List list=attendanceDataService.groupByComany(where); + where.setAttendanceTime(DateUtil.formatDate(DateTime.now())); + List list=attendanceDataService.groupTodayCompanyTypeId(where); return AjaxResult.success(list); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java index 0aaddcc3..c156d515 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java @@ -94,4 +94,6 @@ public interface SurProjectAttendanceDataMapper public String findHuaZhuCompanyType(String deptName); public List todayAttendance(SurProjectAttendanceData where); + + public List groupTodayCompanyTypeId(SurProjectAttendanceData where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java index 555f06bb..42bbc92f 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java @@ -95,4 +95,6 @@ public interface ISurProjectAttendanceDataService public List> initHuaZhuData(Map data); List todayAttendance(SurProjectAttendanceData where); + + List groupTodayCompanyTypeId(SurProjectAttendanceData where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java index c03a9227..070d964d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -292,4 +292,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc public List todayAttendance(SurProjectAttendanceData where) { return surProjectAttendanceDataMapper.todayAttendance(where); } + + @Override + public List groupTodayCompanyTypeId(SurProjectAttendanceData where) { + return surProjectAttendanceDataMapper.groupTodayCompanyTypeId(where); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index 5aa915fd..97bfb44c 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -382,4 +382,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file