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
5c644f95
Commit
5c644f95
authored
Apr 14, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9
parents
11db0ba0
5cc59456
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+8
-0
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
5c644f95
...
@@ -575,6 +575,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -575,6 +575,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
checkVo
=
checkInsuranceExit
(
insurancePreVo
,
preVo
.
getEmployeeName
(),
preVo
.
getEmpIdcard
());
checkVo
=
checkInsuranceExit
(
insurancePreVo
,
preVo
.
getEmployeeName
(),
preVo
.
getEmpIdcard
());
if
(
null
!=
checkVo
)
{
if
(
null
!=
checkVo
)
{
errorList
.
add
(
checkVo
);
errorList
.
add
(
checkVo
);
}
else
{
if
(
Common
.
isEmpty
(
insurancePreVo
.
getProcessStatus
()))
{
insurancePreVo
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
}
}
}
}
}
if
(!
errorList
.
isEmpty
())
{
if
(!
errorList
.
isEmpty
())
{
...
@@ -681,6 +685,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -681,6 +685,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
null
!=
checkVo
)
{
if
(
null
!=
checkVo
)
{
errorList
.
add
(
checkVo
);
errorList
.
add
(
checkVo
);
continue
;
continue
;
}
else
{
if
(
Common
.
isEmpty
(
insurancePreVo
.
getProcessStatus
()))
{
insurancePreVo
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
}
}
}
//入职日期需要小于等于保单截止日期
//入职日期需要小于等于保单截止日期
if
(
registration
.
getJoinLeaveDate
().
after
(
insurancePreVo
.
getPolicyEnd
()))
{
if
(
registration
.
getJoinLeaveDate
().
after
(
insurancePreVo
.
getPolicyEnd
()))
{
...
...
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