Commit e323b98c authored by 赵啸非's avatar 赵啸非

修改考勤汇总

parent 75b6fd77
...@@ -404,7 +404,29 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -404,7 +404,29 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
throw new AppException("不支持当前绩效类型"); throw new AppException("不支持当前绩效类型");
} }
PerformAttendAppealEntity appealEntity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(performDetailInfo.getId())); PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(performDetailInfo.getId()));
// updateAppealResult(performInfo, entity);
if (!ObjectUtils.isEmpty(entity)) {
Boolean bool = entity.newEntity();
if (bool) {
performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
}else {
if (AppealResultEnum.通过.getValue() == entity.getAppealResult()) {
performDetailInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
} else if (AppealResultEnum.不通过.getValue() == entity.getAppealResult()) {
performDetailInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
} else {
performDetailInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
}
}
} else {
performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
}
/*
if (ObjectUtils.isEmpty(appealEntity)) { if (ObjectUtils.isEmpty(appealEntity)) {
performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue()); performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
} else { } else {
...@@ -417,7 +439,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -417,7 +439,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performDetailInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue()); performDetailInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
} }
} }
} }*/
PerformRulesEntity rulesEntity = rulesService.getCache(performDetailInfo.getRuleId().toString()); PerformRulesEntity rulesEntity = rulesService.getCache(performDetailInfo.getRuleId().toString());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment