bug修改

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

@@ -39,7 +39,8 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
     @Override
     protected void updateAfter(AttendanceLeaveRecordEntity entity, Context context) throws AppException {
         super.updateAfter(entity, context);
-        if (entity.getAuditResult() == 1) {
+        //context!=null时表示页面调用的修改，自动执行处理任务调用时context为null，无需立即汇总
+        if (entity.getAuditResult() == 1 && context!=null) {
             AttendanceSummaryQuery query = new AttendanceSummaryQuery();
             query.setStaffId(entity.getLeavePersonId());
             query.setSummaryTimeStart(DateUtils.getStrDate(entity.getStartTime()));

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

@@ -212,12 +212,14 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
 
     @Override
     public void doReprocess(AttendanceRecordErrorQuery query, Context context) {
+        log.info("开始执行任务:重新生成已处理的绩效考勤核查数据.....");
         List<String> dateList = getDatesBetween(query.getErrorDateTimeStart(), query.getErrorDateTimeEnd());
         for (String day : dateList) {
             query.setErrorDateTimeStart(day);
             query.setErrorDateTimeEnd(day);
             List<AttendanceRecordErrorEntity> list = this.find(query);
             if (CollectionUtils.isNotEmpty(list)) {
+                log.info("重新生成["+day+"]已处理的绩效考勤核查数据.....");
                 for (AttendanceRecordErrorEntity entity : list) {
                     if (YesNoEnum.YES.getValue() == entity.getProcessStatus()) {
                         //判断后打绩效
@@ -287,7 +289,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
                 }
             }
         }
-
+        log.info("从新生成已处理的绩效考勤核查数据,执行完成.....");
     }
 
     private List<String> getDatesBetween(String startDateStr, String endDateStr) {