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
3b703cf4
Commit
3b703cf4
authored
Jan 29, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化-fxj
parent
127f30d3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
22 deletions
+45
-22
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+3
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+34
-14
DoJointInsuranceTask.java
...ud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
+8
-8
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
3b703cf4
...
@@ -171,10 +171,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -171,10 +171,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
public
IPage
<
EmployeeRegistration
>
getHrConfirmEmployeeRegistrationPage
(
Page
<
EmployeeRegistration
>
page
,
EmployeeRegistrationSearchVo
employeeRegistration
)
{
public
IPage
<
EmployeeRegistration
>
getHrConfirmEmployeeRegistrationPage
(
Page
<
EmployeeRegistration
>
page
,
EmployeeRegistrationSearchVo
employeeRegistration
)
{
//权限和条件赋值
//权限和条件赋值
initSearchVo
(
employeeRegistration
);
initSearchVo
(
employeeRegistration
);
log
.
error
(
"入职待确认查询条件1:"
+
employeeRegistration
.
getStatusList
());
if
(
Common
.
isEmpty
(
employeeRegistration
.
getStatusList
()))
{
if
(
Common
.
isEmpty
(
employeeRegistration
.
getStatusList
()))
{
employeeRegistration
.
setStatusList
(
CommonConstants
.
processPreStatus
);
employeeRegistration
.
setStatusList
(
CommonConstants
.
processPreStatus
);
log
.
error
(
"入职待确认查询条件2:"
+
CommonConstants
.
processPreStatus
);
}
}
employeeRegistration
.
setTypeList
(
CommonConstants
.
processPreStatus
);
employeeRegistration
.
setTypeList
(
CommonConstants
.
processPreStatus
);
log
.
error
(
"入职待确认查询条件3:"
+
employeeRegistration
.
getStatusList
());
return
baseMapper
.
getEmployeeRegistrationPage
(
page
,
employeeRegistration
);
return
baseMapper
.
getEmployeeRegistrationPage
(
page
,
employeeRegistration
);
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
3b703cf4
...
@@ -749,6 +749,29 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -749,6 +749,29 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
}
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
Date
preDispatchDate
=
DateUtil
.
formatDateByPatten
(
new
Date
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
TEmployeeInsuranceWorkDayVo
dayVo
=
null
;
LocalTime
currentTime
=
LocalTime
.
now
();
R
<
TEmployeeInsuranceWorkDayVo
>
dataR
;
if
(!
currentTime
.
isBefore
(
LocalTime
.
of
(
15
,
20
))
&&
!
currentTime
.
equals
(
LocalTime
.
of
(
15
,
20
)))
{
preDispatchDate
=
DateUtil
.
addDayByDate
(
preDispatchDate
,
1
);
}
//日期赋值
dayVo
=
new
TEmployeeInsuranceWorkDayVo
();
dayVo
.
setType
(
CommonConstants
.
TWO_STRING
);
dayVo
.
setRegistDate
(
preDispatchDate
);
try
{
dataR
=
socialDaprUtils
.
getBeforeOrAfterWorkDay
(
dayVo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Common
.
isNotNull
(
dataR
.
getData
())
&&
Common
.
isNotNull
(
dataR
.
getData
().
getRegistDate
()))
{
preDispatchDate
=
dataR
.
getData
().
getPriDisDate
();
}
else
{
return
R
.
failed
(
"获取最近工作日失败!"
);
}
}
catch
(
Exception
e
){
return
R
.
failed
(
"获取最近工作日异常:"
+
e
.
getMessage
());
}
Map
<
String
,
List
<
InsuranceReplaceParam
>>
map
=
replaceInsuranceCheck
(
paramList
,
user
,
autoFlag
);
Map
<
String
,
List
<
InsuranceReplaceParam
>>
map
=
replaceInsuranceCheck
(
paramList
,
user
,
autoFlag
);
//返回给前端的结果
//返回给前端的结果
List
<
InsuranceReplaceParam
>
listResult
=
map
.
get
(
"listResult"
);
List
<
InsuranceReplaceParam
>
listResult
=
map
.
get
(
"listResult"
);
...
@@ -769,6 +792,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -769,6 +792,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setIsEffect
(
CommonConstants
.
ONE_INT
);
detail
.
setIsEffect
(
CommonConstants
.
ONE_INT
);
detail
.
setIsOverdue
(
null
);
detail
.
setIsOverdue
(
null
);
detail
.
setUpdateTime
(
LocalDateTime
.
now
());
detail
.
setUpdateTime
(
LocalDateTime
.
now
());
detail
.
setPreHandleTime
(
LocalDateUtil
.
parseLocalDate
(
DateUtil
.
formatDate
(
preDispatchDate
)));
this
.
updateById
(
detail
);
this
.
updateById
(
detail
);
// 保险公司-险种-购买标准 是否存在
// 保险公司-险种-购买标准 是否存在
insuranceCompany
=
tInsuranceCompanyService
.
getOne
(
Wrappers
.<
TInsuranceCompany
>
query
().
lambda
()
insuranceCompany
=
tInsuranceCompanyService
.
getOne
(
Wrappers
.<
TInsuranceCompany
>
query
().
lambda
()
...
@@ -2238,20 +2262,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -2238,20 +2262,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
CollectionUtils
.
isNotEmpty
(
sourceIdCardList
))
{
if
(
CollectionUtils
.
isNotEmpty
(
sourceIdCardList
))
{
this
.
doFailInfo
(
sourceList
,
sourceIdCardList
,
replaceIdList
,
CommonConstants
.
THREE_STRING
);
this
.
doFailInfo
(
sourceList
,
sourceIdCardList
,
replaceIdList
,
CommonConstants
.
THREE_STRING
);
}
}
if
(
CollectionUtils
.
isNotEmpty
(
successList
))
{
// 异步任务操作档案的 商险状态为:2正常(0无2正常3失效4处理中)
doJointInsuranceTask
.
updateEmpInfp
(
successList
,
CommonConstants
.
TWO_STRING
);
//从successList中排查 successThree 的数据 这部分不同推送
if
(
Common
.
isNotNull
(
successThree
)){
successList
.
removeAll
(
successThree
);
}
//异步任务推送
doJointInsuranceTask
.
pushEstime
(
successList
);
}
//操作记录
if
(
Common
.
isNotNull
(
successThree
)){
successList
.
addAll
(
successThree
);
}
if
(
CollectionUtils
.
isNotEmpty
(
successList
)){
if
(
CollectionUtils
.
isNotEmpty
(
successList
)){
for
(
TInsuranceDetail
detail
:
successList
)
{
for
(
TInsuranceDetail
detail
:
successList
)
{
//获取成功数据的remark
//获取成功数据的remark
...
@@ -2262,6 +2272,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -2262,6 +2272,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
});
});
}
}
}
}
if
(
CollectionUtils
.
isNotEmpty
(
successList
))
{
// 异步任务操作档案的 商险状态为:2正常(0无2正常3失效4处理中)
doJointInsuranceTask
.
updateEmpInfp
(
successList
,
CommonConstants
.
TWO_STRING
);
//从successList中排查 successThree 的数据 这部分不同推送
if
(
Common
.
isNotNull
(
successThree
)){
successList
.
removeAll
(
successThree
);
}
//异步任务推送
doJointInsuranceTask
.
pushEstime
(
successList
);
}
addOperate
(
operateList
,
user
,
InsurancesConstants
.
SUCCESSFUL
);
addOperate
(
operateList
,
user
,
InsurancesConstants
.
SUCCESSFUL
);
addOperate
(
sourceList
,
user
,
InsurancesConstants
.
SOURCE_REPLACE
,
null
,
CommonConstants
.
ONE_INT
);
addOperate
(
sourceList
,
user
,
InsurancesConstants
.
SOURCE_REPLACE
,
null
,
CommonConstants
.
ONE_INT
);
return
R
.
ok
(
errorList
,
InsurancesConstants
.
OPERATE_SUCCESS
);
return
R
.
ok
(
errorList
,
InsurancesConstants
.
OPERATE_SUCCESS
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
View file @
3b703cf4
...
@@ -731,14 +731,14 @@ public class DoJointInsuranceTask {
...
@@ -731,14 +731,14 @@ public class DoJointInsuranceTask {
if
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
.
equals
(
param
.
getSettleType
()))
{
if
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
.
equals
(
param
.
getSettleType
()))
{
EkpInsurancesInfo
info
=
insurancesInfoMapper
.
getEkpInsurancesInfoYg
(
param
.
getDetailId
()+
EkpInsurancesInfo
info
=
insurancesInfoMapper
.
getEkpInsurancesInfoYg
(
param
.
getDetailId
()+
CommonConstants
.
DOWN_LINE_STRING
+
(
null
==
param
.
getDefaultSettleId
()
?
""
:
param
.
getDefaultSettleId
()));
CommonConstants
.
DOWN_LINE_STRING
+
(
null
==
param
.
getDefaultSettleId
()
?
""
:
param
.
getDefaultSettleId
()));
//特殊处理下是否见费出单 是否全部结算为是
if
(
"0"
.
equals
(
param
.
getIsJfcd
()))
{
//见费出单 是否全部结算 都是 是
info
.
setFd_3b13b2ecc164aa
(
"是"
);
//实际结算月份置空
info
.
setFd_3af9d11088facc
(
null
);
}
if
(
Common
.
isNotNull
(
info
))
{
if
(
Common
.
isNotNull
(
info
))
{
//特殊处理下是否见费出单 是否全部结算为是
if
(
"0"
.
equals
(
param
.
getIsJfcd
()))
{
//见费出单 是否全部结算 都是 是
info
.
setFd_3b13b2ecc164aa
(
"是"
);
//实际结算月份置空
info
.
setFd_3af9d11088facc
(
null
);
}
initValueUpdate
(
info
,
deptInfoVo
,
param
);
initValueUpdate
(
info
,
deptInfoVo
,
param
);
}
}
}
}
...
@@ -792,7 +792,7 @@ public class DoJointInsuranceTask {
...
@@ -792,7 +792,7 @@ public class DoJointInsuranceTask {
//实际保费
//实际保费
info
.
setFd_3adfe6610c0d2c
(
null
!=
param
.
getActualPremium
()
?
param
.
getActualPremium
().
doubleValue
()
:
null
);
info
.
setFd_3adfe6610c0d2c
(
null
!=
param
.
getActualPremium
()
?
param
.
getActualPremium
().
doubleValue
()
:
null
);
//应收
//应收
info
.
setFd_3adfe6e30f2a3c
(
"是"
.
equals
(
param
.
getBpoFlag
())
?
0
:
BigDecimalUtils
.
s
afeSubtract
(
false
,
param
.
getActualPremium
(),
param
.
getEstimatePremium
()).
doubleValue
());
info
.
setFd_3adfe6e30f2a3c
(
"是"
.
equals
(
param
.
getBpoFlag
())
?
0
:
BigDecimalUtils
.
s
ubtractAllowNegative
(
param
.
getActualPremium
(),
param
.
getEstimatePremium
()).
doubleValue
());
//应支
//应支
info
.
setFd_3adfe6e3911ffe
(
param
.
getActualPremium
().
doubleValue
());
info
.
setFd_3adfe6e3911ffe
(
param
.
getActualPremium
().
doubleValue
());
if
(
"0"
.
equals
(
param
.
getIsJfcd
())){
if
(
"0"
.
equals
(
param
.
getIsJfcd
())){
...
...
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