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
53017ade
Commit
53017ade
authored
Apr 15, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9
parents
73380ac6
095651f3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+1
-1
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
53017ade
...
...
@@ -682,7 +682,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
//入职日期需要小于保单截止日期
if
((
DateUtil
.
dateToString
(
registration
.
getJoinLeaveDate
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
).
compareTo
(
DateUtil
.
dateToString
(
insurancePreVo
.
getPolicyEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))
>
=
0
)
compareTo
(
DateUtil
.
dateToString
(
insurancePreVo
.
getPolicyEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))
>
0
)
||
(
DateUtil
.
dateToString
(
insurancePreVo
.
getPolicyStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
).
compareTo
(
DateUtil
.
dateToString
(
insurancePreVo
.
getPolicyEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))
>
0
))
{
TEmployeeInsuranceExitCheckVo
exitCheckVo
=
new
TEmployeeInsuranceExitCheckVo
();
...
...
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