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
98197959
Commit
98197959
authored
Apr 14, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职登记商险待办提交
parent
5c644f95
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
12 deletions
+27
-12
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+12
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+2
-2
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+13
-8
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
98197959
...
...
@@ -277,7 +277,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if
(
null
!=
oldList
&&
!
oldList
.
isEmpty
())
{
for
(
TEmployeeInsurancePre
oldInsurance
:
oldList
)
{
// 1:判断是否变更 商险待办 的项目
if
(
null
!=
map
.
get
(
this
.
getFiveKey
(
oldInsurance
)))
{
if
(
null
!=
map
.
get
(
this
.
get
PreOld
FiveKey
(
oldInsurance
)))
{
oldMap
.
put
(
oldInsurance
.
getId
(),
oldInsurance
);
}
}
...
...
@@ -744,7 +744,17 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return
isNullToEmpty
(
insurancePreVo
.
getBuyStandard
())
+
CommonConstants
.
DOWN_LINE_STRING
+
isNullToEmpty
(
insurancePreVo
.
getInsuranceTypeName
())
+
CommonConstants
.
DOWN_LINE_STRING
+
isNullToEmpty
(
insurancePreVo
.
getInsuranceCompanyName
())
+
CommonConstants
.
DOWN_LINE_STRING
+
isNullToEmpty
(
insurancePreVo
.
getPolicyStart
())
+
CommonConstants
.
DOWN_LINE_STRING
+
isNullToEmpty
(
insurancePreVo
.
getPolicyEnd
());
+
isNullToEmpty
(
DateUtil
.
dateToString
(
insurancePreVo
.
getPolicyStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))
+
DateUtil
.
dateToString
(
insurancePreVo
.
getPolicyEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
}
private
String
getPreOldFiveKey
(
TEmployeeInsurancePre
insurancePreVo
)
{
// 1:重复性判断
return
isNullToEmpty
(
insurancePreVo
.
getBuyStandard
())
+
CommonConstants
.
DOWN_LINE_STRING
+
isNullToEmpty
(
insurancePreVo
.
getInsuranceTypeName
())
+
CommonConstants
.
DOWN_LINE_STRING
+
isNullToEmpty
(
insurancePreVo
.
getInsuranceCompanyName
())
+
CommonConstants
.
DOWN_LINE_STRING
+
isNullToEmpty
(
DateUtil
.
dateToString
(
insurancePreVo
.
getPolicyStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))
+
DateUtil
.
dateToString
(
insurancePreVo
.
getPolicyEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
}
/**
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
98197959
...
...
@@ -569,8 +569,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
else
{
return
R
.
other
(
CommonConstants
.
TWO_INT
,
null
,
"保险公司、险种、购买标准、保单起/止日期不可同时重复!"
);
}
insurancePreVo
.
setEmpIdcard
(
preVo
.
getEmpIdcard
());
insurancePreVo
.
setDeptNo
(
preVo
.
getDeptNo
());
insurancePreVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
insurancePreVo
.
setDeptNo
(
registration
.
getDeptNo
());
//商险是否存在判断
checkVo
=
checkInsuranceExit
(
insurancePreVo
,
preVo
.
getEmployeeName
(),
preVo
.
getEmpIdcard
());
if
(
null
!=
checkVo
)
{
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
98197959
...
...
@@ -376,14 +376,19 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
@Override
public
TEmployeeInsuranceSelectVo
selectInsurancePreInfoList
(
TEmployeeInsurancePreVo
preVo
)
{
TEmployeeInsuranceSelectVo
selectVo
=
new
TEmployeeInsuranceSelectVo
();
List
<
TEmployeeInsurancePre
>
list
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeInsurancePre
>
query
().
lambda
()
List
<
TEmployeeInsurancePre
>
list
=
new
ArrayList
<>();
try
{
list
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeInsurancePre
>
query
().
lambda
()
.
eq
(
TEmployeeInsurancePre:
:
getEmpIdcard
,
preVo
.
getEmpIdcard
())
.
eq
(
TEmployeeInsurancePre:
:
getBuyStandard
,
preVo
.
getBuyStandard
())
.
eq
(
TEmployeeInsurancePre:
:
getInsuranceTypeName
,
preVo
.
getInsuranceTypeName
())
.
eq
(
TEmployeeInsurancePre:
:
getInsuranceCompanyName
,
preVo
.
getInsuranceCompanyName
())
.
eq
(
TEmployeeInsurancePre:
:
getPolicyStart
,
preVo
.
getPolicyStart
(
))
.
eq
(
TEmployeeInsurancePre:
:
getPolicyEnd
,
preVo
.
getPolicyEnd
(
))
.
eq
(
TEmployeeInsurancePre:
:
getPolicyStart
,
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
preVo
.
getPolicyStart
()),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))
.
eq
(
TEmployeeInsurancePre:
:
getPolicyEnd
,
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
preVo
.
getPolicyEnd
()),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))
);
}
catch
(
Exception
e
){
log
.
error
(
"执行异常"
,
e
);
}
selectVo
.
setInsurancePreList
(
list
);
return
selectVo
;
}
...
...
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