Merge remote-tracking branch 'origin/master'

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

@@ -161,6 +161,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
             if(dayOfWeek==Calendar.SATURDAY||dayOfWeek==Calendar.SUNDAY){
                 return;
             }
+            Date today = DateUtils.getCurrDate();
+            if(DateUtils.StrToDate(query.getSummaryTime()).compareTo(today)>=0){
+                return;
+            }
+
             log.info("开始汇总[" + query.getSummaryTime() + "]考勤.....");
             //汇总当前日期假期余额
             List<VacationBalanceSummaryVo> vacationBalanceSummaryVoList = attendanceSummaryDao.getVacationBalanceSummary(query);