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
1d01cc45
Commit
1d01cc45
authored
Apr 15, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职登记商险待办提交
parent
98197959
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
17 deletions
+20
-17
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+16
-13
TEmployeeInsurancePreExportVo.java
.../v1/yifu/insurances/vo/TEmployeeInsurancePreExportVo.java
+3
-3
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.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 @
1d01cc45
...
...
@@ -680,18 +680,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insurancePreVo
.
setPolicyEffect
(
registration
.
getJoinLeaveDate
());
insurancePreVo
.
setPolicyStart
(
registration
.
getJoinLeaveDate
());
}
//商险是否存在判断
checkVo
=
checkInsuranceExit
(
insurancePreVo
,
registration
.
getEmployeeName
(),
registration
.
getEmpIdcard
());
if
(
null
!=
checkVo
)
{
errorList
.
add
(
checkVo
);
continue
;
}
else
{
if
(
Common
.
isEmpty
(
insurancePreVo
.
getProcessStatus
()))
{
insurancePreVo
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
}
}
//入职日期需要小于等于保单截止日期
if
(
registration
.
getJoinLeaveDate
().
after
(
insurancePreVo
.
getPolicyEnd
()))
{
//入职日期需要小于保单截止日期
if
((
DateUtil
.
dateToString
(
registration
.
getJoinLeaveDate
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
).
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
();
exitCheckVo
.
setBuyType
(
insurancePreVo
.
getBuyType
());
exitCheckVo
.
setEmployeeName
(
registration
.
getEmployeeName
());
...
...
@@ -701,9 +694,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
exitCheckVo
.
setBuyStandard
(
insurancePreVo
.
getBuyStandard
());
exitCheckVo
.
setInsuranceCompanyName
(
insurancePreVo
.
getInsuranceCompanyName
());
exitCheckVo
.
setInsuranceTypeName
(
insurancePreVo
.
getInsuranceTypeName
());
exitCheckVo
.
setErrorMsg
(
"入职日期需要小于等于保单截止日期!"
);
exitCheckVo
.
setErrorMsg
(
"入职日期需要小于保单截止日期/保单开始日期需小于等于保单截止日期"
);
errorList
.
add
(
exitCheckVo
);
continue
;
}
//商险是否存在判断
checkVo
=
checkInsuranceExit
(
insurancePreVo
,
registration
.
getEmployeeName
(),
registration
.
getEmpIdcard
());
if
(
null
!=
checkVo
)
{
errorList
.
add
(
checkVo
);
continue
;
}
else
{
if
(
Common
.
isEmpty
(
insurancePreVo
.
getProcessStatus
()))
{
insurancePreVo
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
}
}
}
//点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项,
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/TEmployeeInsurancePreExportVo.java
View file @
1d01cc45
...
...
@@ -75,9 +75,9 @@ public class TEmployeeInsurancePreExportVo implements Serializable {
/**
* 是否地市自购0是 1 否
*/
@ExcelAttribute
(
name
=
"是否地市自购
0是 1 否
"
)
@Schema
(
description
=
"是否地市自购
0是 1 否
"
)
@ExcelProperty
(
"是否地市自购
0是 1 否
"
)
@ExcelAttribute
(
name
=
"是否地市自购"
)
@Schema
(
description
=
"是否地市自购"
)
@ExcelProperty
(
"是否地市自购"
)
private
String
isAddress
;
/**
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
1d01cc45
...
...
@@ -348,8 +348,8 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
}
if
(
Common
.
isNotNull
(
preExit
))
{
pre
.
setId
(
preExit
.
getId
());
baseMapper
.
insert
(
pre
);
baseMapper
.
deleteById
(
preExit
);
baseMapper
.
insert
(
pre
);
}
else
{
baseMapper
.
insert
(
pre
);
//暂时不需要,先注释,后续可能会需要
...
...
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