Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/AttendanceSummaryTaskImpl.java

@@ -62,14 +62,17 @@ public class AttendanceSummaryTaskImpl implements ITaskExcuteService {
         log.info("统计添加前一天考勤中绩效异常记录结束");
 
         try {
-            log.info("汇总当天绩效分数开始");
+            log.info("汇总最近两个月绩效分数开始");
             StaffCheckSummaryQuery summaryQuery = new StaffCheckSummaryQuery();
-            summaryQuery.setCheckTimeStart(DateUtils.getCurrStrDate());
-            summaryQuery.setCheckTimeEnd(summaryQuery.getCheckTimeStart());
+            Calendar now1 = Calendar.getInstance();
+            now1.setTime(new Date());
+            now1.add(Calendar.MONTH,-1);
+            summaryQuery.setCheckTimeStart(DateUtils.getDateTime(now1.getTime(),"yyyy-MM")+"-01");
+            summaryQuery.setCheckTimeEnd(DateUtils.getCurrStrDate());
             cacheService.lpush(KEY_CHECK_SUMMARY_CACHE, query);
-            log.info("汇总当天绩效分数结束");
+            log.info("汇总最近两个月绩效分数结束");
         } catch (Exception e) {
-            log.error("汇总当天绩效分数出错", e);
+            log.error("汇总最近两个月绩效分数出错", e);
         }
     }
 
@@ -77,4 +80,5 @@ public class AttendanceSummaryTaskImpl implements ITaskExcuteService {
     public void stopTask(ITask task) throws AppException {
 
     }
+
 }