Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -20,6 +20,7 @@ import com.mortals.xhx.module.attendance.model.vo.ErrorSummaryVo;
 import com.mortals.xhx.module.attendance.model.vo.LeaveSummaryVo;
 import com.mortals.xhx.module.attendance.model.vo.VacationBalanceSummaryVo;
 import com.mortals.xhx.module.attendance.service.*;
+import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.holiday.model.HolidayEntity;
@@ -75,6 +76,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
     @Autowired
     private ICacheService cacheService;
 
+    private AttendanceGroupStaffService attendanceGroupStaffService;
+
     @Override
     protected void findAfter(AttendanceStatEntity entity, Context context, List<AttendanceStatEntity> list) throws AppException {
         // DateUtil.parse(entity.getStartTime()).year();
@@ -610,12 +613,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
 
         int totalPersonNum = staffService.count(staffQuery, context);
         homeStatInfo.setTotalPersonNum(totalPersonNum);
-        staffQuery.setSource(1);
-
-
-        Integer totalAttendPersonNum = staffService.count(staffQuery, context);
+        //统计考勤组人数
+        Integer totalAttendPersonNum = attendanceGroupStaffService.count(new AttendanceGroupStaffQuery(), context);
 
-        int totalDeptNum = deptService.count(new DeptQuery(), context);
+        List<DeptEntity>  deptList = deptService.getDeptBySalaId(-1l);
+        int totalDeptNum = deptList.size();
         homeStatInfo.setTotalDeptNum(totalDeptNum);
 
         AttendanceRecordHikQuery hikQuery = new AttendanceRecordHikQuery();
@@ -680,8 +682,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
         AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery();
 /*        leaveRecordQuery.setCreateTimeStart(DateUtil.beginOfMonth(new Date()).toDateStr());
         leaveRecordQuery.setCreateTimeEnd(DateUtil.today());*/
-        leaveRecordQuery.setCreateTimeStart(DateUtil.yesterday().toDateStr());
-        leaveRecordQuery.setCreateTimeEnd(DateUtil.yesterday().toDateStr());
+//        leaveRecordQuery.setCreateTimeStart(DateUtil.yesterday().toDateStr());
+//        leaveRecordQuery.setCreateTimeEnd(DateUtil.yesterday().toDateStr());
+        //判断当前时间是否在请假开始结束时间范围内，StartTime<=当前日期 EndTime>=当前日期
+        leaveRecordQuery.setStartTimeEnd(DateUtil.yesterday().toDateStr());
+        leaveRecordQuery.setEndTimeStart(DateUtil.yesterday().toDateStr());
         leaveRecordQuery.setProcessStatus(ProcessStatusEnum.已处理.getValue());
         int levealPersonNum = leaveRecordService.count(leaveRecordQuery, context);