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

@@ -146,10 +146,13 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
         try {
             long currentTime = System.currentTimeMillis();
             if (query == null) {
-                query = new AttendanceSummaryQuery(DateUtils.getCurrStrDate());
+                query = new AttendanceSummaryQuery();
             }
             if (StringUtils.isEmpty(query.getSummaryTime())) {
-                query.setSummaryTime(DateUtils.getCurrStrDate());
+                Calendar now = Calendar.getInstance();
+                now.setTime(new Date());
+                now.add(Calendar.DAY_OF_MONTH, -1); //默认查最近30天数据
+                query.setSummaryTime(DateUtils.getStrDate(now.getTime()));
             }
             log.info("开始汇总[" + query.getSummaryTime() + "]考勤.....");
             //汇总当前日期假期余额