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
ec3929eb
Commit
ec3929eb
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
9aa3576d
1d01cc45
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
29 deletions
+47
-29
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+12
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+18
-15
TEmployeeInsurancePreExportVo.java
.../v1/yifu/insurances/vo/TEmployeeInsurancePreExportVo.java
+3
-3
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+14
-9
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
ec3929eb
...
...
@@ -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 @
ec3929eb
...
...
@@ -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
)
{
...
...
@@ -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 @
ec3929eb
...
...
@@ -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 @
ec3929eb
...
...
@@ -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
);
//暂时不需要,先注释,后续可能会需要
...
...
@@ -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
()
.
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
())
);
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
,
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