Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
711d1fef
Commit
711d1fef
authored
Dec 01, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17
parents
5a2fad76
5b411802
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+6
-0
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
711d1fef
...
@@ -1465,6 +1465,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1465,6 +1465,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave
.
setFailEmpProjectRemark
(
errorMessage
);
leave
.
setFailEmpProjectRemark
(
errorMessage
);
leave
.
setFailEmpProjectTime
(
LocalDateTime
.
now
());
leave
.
setFailEmpProjectTime
(
LocalDateTime
.
now
());
leave
.
setDoStatusProject
(
CommonConstants
.
NINE_STRING
);
leave
.
setDoStatusProject
(
CommonConstants
.
NINE_STRING
);
}
else
{
leave
.
setEmpProjectId
(
leave
.
getEmpProjectIdOld
());
leave
.
setDoStatusProject
(
CommonConstants
.
EIGHT_STRING
);
}
}
}
}
}
}
...
@@ -1512,6 +1515,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1512,6 +1515,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave
.
setFailEmpRemark
(
errorMessage
);
leave
.
setFailEmpRemark
(
errorMessage
);
leave
.
setFailEmpTime
(
LocalDateTime
.
now
());
leave
.
setFailEmpTime
(
LocalDateTime
.
now
());
leave
.
setDoStatusEmp
(
CommonConstants
.
NINE_STRING
);
leave
.
setDoStatusEmp
(
CommonConstants
.
NINE_STRING
);
}
else
{
leave
.
setEmpId
(
leave
.
getEmpIdOld
());
leave
.
setDoStatusEmp
(
CommonConstants
.
EIGHT_STRING
);
}
}
}
}
}
}
...
...
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