Commit ed43d9a9 authored by 廖旭伟's avatar 廖旭伟

考勤异常处理增加年假类型

parent 76389642
...@@ -14,7 +14,8 @@ public enum ErrorStatusEnum { ...@@ -14,7 +14,8 @@ public enum ErrorStatusEnum {
迟到(2, "迟到"), 迟到(2, "迟到"),
正常(3, "正常"), 正常(3, "正常"),
事假半天(4, "事假半天"), 事假半天(4, "事假半天"),
事假全天(5, "事假全天"); 事假全天(5, "事假全天"),
年假(6, "年假");
private Integer value; private Integer value;
private String desc; private String desc;
......
...@@ -120,7 +120,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -120,7 +120,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
saveAttendPerformRecord(context, entity, ruleCode); saveAttendPerformRecord(context, entity, ruleCode);
} }
//考勤异常处理为正常后修改考勤绩效 //考勤异常处理为正常后修改考勤绩效
if (entity.getProcessResult().equals(ErrorStatusEnum.正常.getValue().toString())) { if (entity.getProcessResult().equals(ErrorStatusEnum.正常.getValue().toString())||entity.getProcessResult().equals(ErrorStatusEnum.年假.getValue().toString())) {
CheckAttendRecordEntity checkAttendRecordQuery = new CheckAttendRecordEntity(); CheckAttendRecordEntity checkAttendRecordQuery = new CheckAttendRecordEntity();
checkAttendRecordQuery.setStaffId(entity.getStaffId()); checkAttendRecordQuery.setStaffId(entity.getStaffId());
checkAttendRecordQuery.setErrorTime(entity.getErrorDateTime()); checkAttendRecordQuery.setErrorTime(entity.getErrorDateTime());
......
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