Merge remote-tracking branch 'origin/master'

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

@@ -9,13 +9,15 @@ import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.busiz.h5.req.AttendSaveReq;
 import com.mortals.xhx.busiz.h5.web.ApiWebPerformController;
-import com.mortals.xhx.common.code.AppealResultEnum;
-import com.mortals.xhx.common.code.ErrorStatusEnum;
-import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.module.attendance.model.*;
 import com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery;
 import com.mortals.xhx.module.attendance.model.vo.ErrorSummaryVo;
 import com.mortals.xhx.module.attendance.service.*;
+import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
+import com.mortals.xhx.module.check.model.CheckAttendRecordQuery;
+import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
+import com.mortals.xhx.module.check.service.CheckAttendRecordService;
 import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
 import com.mortals.xhx.module.perform.model.PerformAttendRecordQuery;
 import com.mortals.xhx.module.perform.service.PerformAttendRecordService;
@@ -38,6 +40,7 @@ import java.util.Date;
 import java.util.List;
 
 import static com.mortals.xhx.common.key.RedisKey.KEY_ATTENDANCE_STAT_CACHE;
+import static com.mortals.xhx.common.key.RedisKey.KEY_CHECK_SUMMARY_CACHE;
 
 /**
  * AttendanceRecordErrorService
@@ -58,6 +61,8 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
     private ICacheService cacheService;
     @Autowired
     private AttendanceLeaveRecordService attendanceLeaveRecordService;
+    @Autowired
+    private CheckAttendRecordService checkAttendRecordService;
 
 
     @Override
@@ -96,6 +101,28 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
             if (!ObjectUtils.isEmpty(ruleCode)) {
                 saveAttendPerformRecord(context, entity, ruleCode);
             }
+            //考勤异常处理为正常后修改考勤绩效
+            if(entity.getProcessResult().equals(ErrorStatusEnum.正常.getValue().toString())){
+                CheckAttendRecordEntity checkAttendRecordQuery = new CheckAttendRecordEntity();
+                checkAttendRecordQuery.setStaffId(entity.getStaffId());
+                checkAttendRecordQuery.setErrorTime(entity.getErrorDateTime());
+                CheckAttendRecordEntity checkAttendRecord = checkAttendRecordService.selectOne(checkAttendRecordQuery);
+                if(checkAttendRecord!=null){
+                    CheckAttendRecordEntity checkAttendUpdate = new CheckAttendRecordEntity();
+                    checkAttendUpdate.setId(checkAttendRecord.getId());
+                    checkAttendUpdate.setCheckResult(CheckResultSubEnum.核查不扣分.getValue());
+                    checkAttendUpdate.setAuditStatus(AuditStatusEnum.拒绝.getValue());
+                    checkAttendUpdate.setUpdateTime(new Date());
+                    checkAttendUpdate.setCheckStatus(CheckStatusEnum.已处理.getValue());
+                    checkAttendRecordService.update(checkAttendUpdate,context);
+                    StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
+                    query.setStaffId(checkAttendRecord.getStaffId());
+                    query.setCheckTimeStart(DateUtils.getStrDate(checkAttendRecord.getCheckTime()));
+                    query.setCheckTimeEnd(query.getCheckTimeStart());
+                    query.setCheckType(CheckTypeEnum.考勤绩效.getValue());
+                    cacheService.lpush(KEY_CHECK_SUMMARY_CACHE, query);
+                }
+            }
             //异常处理后重新汇总考勤 context!=null时表示页面调用的修改，自动执行处理任务调用时context为null，无需立即汇总
             if (StringUtils.isNotEmpty(entity.getProcessResult()) && context != null) {
                 AttendanceSummaryQuery query = new AttendanceSummaryQuery();