Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
ed43d9a9
Commit
ed43d9a9
authored
Sep 11, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
考勤异常处理增加年假类型
parent
76389642
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/ErrorStatusEnum.java
...ain/java/com/mortals/xhx/common/code/ErrorStatusEnum.java
+2
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
...ndance/service/impl/AttendanceRecordErrorServiceImpl.java
+1
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/ErrorStatusEnum.java
View file @
ed43d9a9
...
@@ -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
;
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
View file @
ed43d9a9
...
@@ -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
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment