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
f0ee702d
Commit
f0ee702d
authored
Feb 15, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
分布式锁调试--档案新增副本数测试
parent
dc20a07e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
114 additions
and
62 deletions
+114
-62
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+50
-16
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+64
-46
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
f0ee702d
...
...
@@ -3471,7 +3471,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo
=
socialMapper
.
selectById
(
dis
.
getSocialId
());
socialTypeRemark
=
getHandleRemark
(
socialType
,
socialInfo
,
dis
.
getType
(),
sf
);
// 无更新直接跳过
if
(
Common
.
isEmpty
(
socialTypeRemark
.
toString
()))
{
if
(
Common
.
isEmpty
(
socialTypeRemark
.
toString
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
typeSub
)
)
{
continue
;
}
}
else
{
...
...
@@ -3730,8 +3730,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
if
(
Common
.
isEmpty
(
dis
.
getFundId
())
&&
Common
.
isNotNull
(
dis
.
getSocialId
())
&&(
CommonConstants
.
ONE_STRING
.
equals
(
dis
.
getSocialHandleStatus
())
||
CommonConstants
.
TWO_STRING
.
equals
(
dis
.
getSocialHandleStatus
())
)
||
CommonConstants
.
THREE_STRING
.
equals
(
dis
.
getSocialHandleStatus
()))
{
||
CommonConstants
.
TWO_STRING
.
equals
(
dis
.
getSocialHandleStatus
())
||
CommonConstants
.
THREE_STRING
.
equals
(
dis
.
getSocialHandleStatus
()))
)
{
//办理成功
dis
.
setStatus
(
CommonConstants
.
FOUR_STRING
);
}
...
...
@@ -3776,17 +3776,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 派减公积金办理失败不同步档案的相关字段信息
if
(!(
CommonConstants
.
ONE_STRING
.
equals
(
dis
.
getType
())
&&
CommonConstants
.
ONE_INT
==
flag
&&
CommonConstants
.
ONE_STRING
.
equals
(
typeSub
)
||
CommonConstants
.
NINE_STRING
.
equals
(
sf
.
getSocialStatus
()))){
&&
CommonConstants
.
ONE_STRING
.
equals
(
typeSub
))){
UpProjectSocialFundVo
vo
=
new
UpProjectSocialFundVo
();
// 社保状态 社保状态(字典): 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减
initSocialFundStatus
(
socialInfo
,
providentFund
,
vo
,
sf
);
vo
.
setEmpIdCard
(
dis
.
getEmpIdcard
());
vo
.
setDepartNo
(
dis
.
getSettleDomainCode
());
R
<
Boolean
>
resUp
=
archivesDaprUtil
.
updateProjectSocialFund
(
vo
);
if
(
Common
.
isEmpty
(
resUp
)
||
!(
CommonConstants
.
SUCCESS
.
intValue
()
==
resUp
.
getCode
())
||
!
resUp
.
getData
().
booleanValue
()){
errorList
.
add
(
new
ErrorMessage
(-
1
,
DispatchConstants
.
DISPATCH_SYN_DOC_EXE
,
CommonConstants
.
RED
,
dis
.
getEmpName
()));
continue
;
if
(
Common
.
isNotNull
(
vo
.
getSocialStatus
())){
vo
.
setEmpIdCard
(
dis
.
getEmpIdcard
());
vo
.
setDepartNo
(
dis
.
getSettleDomainCode
());
R
<
Boolean
>
resUp
=
archivesDaprUtil
.
updateProjectSocialFund
(
vo
);
if
(
Common
.
isEmpty
(
resUp
)
||
!(
CommonConstants
.
SUCCESS
.
intValue
()
==
resUp
.
getCode
())
||
!
resUp
.
getData
().
booleanValue
()){
errorList
.
add
(
new
ErrorMessage
(-
1
,
DispatchConstants
.
DISPATCH_SYN_DOC_EXE
,
CommonConstants
.
RED
,
dis
.
getEmpName
()));
continue
;
}
}
}
}
else
{
...
...
@@ -3866,17 +3867,36 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 部分办理失败或审核不通过部分办理成功或派减部分办理失败 为 部分购买
if
(
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getSocialStatus
())
||
CommonConstants
.
TWELVE_STRING
.
equals
(
sf
.
getSocialStatus
())
||
(
CommonConstants
.
TEN_STRING
.
equals
(
sf
.
getSocialStatus
())
||
(
CommonConstants
.
TEN_STRING
.
equals
(
sf
.
getSocialStatus
())
&&
(
CommonConstants
.
ONE_STRING
.
equals
(
sf
.
getPensionHandle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
sf
.
getMedicalHandle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
sf
.
getWorkInjuryHandle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
sf
.
getBirthHandle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
sf
.
getUnemployHandle
())
||
(
CommonConstants
.
ONE_STRING
.
equals
(
sf
.
getBigailmentHandle
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
sf
.
getIsIllness
()))
))){
||
CommonConstants
.
ONE_STRING
.
equals
(
sf
.
getUnemployHandle
()))
||
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getPensionHandle
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getMedicalHandle
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getWorkInjuryHandle
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getBirthHandle
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getUnemployHandle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
sf
.
getBigailmentHandle
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getBigailmentHandle
()))
){
vo
.
setSocialStatus
(
CommonConstants
.
TWO_STRING
);
}
if
(
CommonConstants
.
NINE_STRING
.
equals
(
sf
.
getSocialStatus
())){
// 如果办理失败 全部派减失败为正常购买
if
(
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getPensionHandle
())
&&
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getMedicalHandle
())
&&
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getWorkInjuryHandle
())
&&
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getBirthHandle
())
&&
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getUnemployHandle
())
&&
(
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getBigailmentHandle
())
||
Common
.
isEmpty
(
sf
.
getBigailmentHandle
()))){
vo
.
setSocialStatus
(
CommonConstants
.
THREE_STRING
);
}
}
if
(
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
getSocialStatus
())){
vo
.
setSocialStatus
(
CommonConstants
.
THREE_STRING
);
}
...
...
@@ -4118,6 +4138,20 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
)
||
Common
.
isEmpty
(
socialInfo
.
getBigailmentHandle
()))
){
if
(
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getBirthHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())){
// 派减部分办理失败
socialInfo
.
setHandleStatus
(
CommonConstants
.
SEVEN_STRING
);
sf
.
setSocialStatus
(
CommonConstants
.
TWELVE_STRING
);
sf
.
setSocialReduceStatus
(
CommonConstants
.
SIX_STRING
);
socialInfo
.
setReduceCan
(
CommonConstants
.
ZERO_STRING
);
dis
.
setSocialHandleStatus
(
CommonConstants
.
THREE_STRING
);
return
;
}
socialInfo
.
setHandleStatus
(
CommonConstants
.
ONE_STRING
);
sf
.
setSocialStatus
(
CommonConstants
.
NINE_STRING
);
sf
.
setSocialReduceStatus
(
CommonConstants
.
THREE_STRING
);
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
f0ee702d
...
...
@@ -616,114 +616,126 @@
when a.TYPE = 1 then "派减"
else null end as "TYPE" ,
a.SOCIAL_HOUSEHOLD_NAME,
case when
a.STATUS = 0 then "
待办理"
when s.HANDLE_STATUS = 1 then "办理成功"
when s.HANDLE_STATUS = 2 then "办理失败"
case when
s.HANDLE_STATUS = 0 then "派增
待办理"
when s.HANDLE_STATUS = 1 then "
派增
办理成功"
when s.HANDLE_STATUS = 2 then "
派增
办理失败"
when s.HANDLE_STATUS = 3 then "已派减"
when s.HANDLE_STATUS = 4 then "办理中"
when s.HANDLE_STATUS = 5 then "部分办理失败"
when s.HANDLE_STATUS = 4 then "
派增
办理中"
when s.HANDLE_STATUS = 5 then "
派增
部分办理失败"
when s.HANDLE_STATUS = 6 then "派减办理中"
when s.HANDLE_STATUS = 7 then "派减部分办理失败"
else null end as "SOCIAL_HANDLE_STATUS",
IF(a.TYPE='0',
case when s.PENSION_HANDLE = 0 then "待办理"
when s.PENSION_HANDLE = 1 then "办理成功"
when s.PENSION_HANDLE = 2 then "办理失败"
case when s.PENSION_HANDLE = 0 then "
派增
待办理"
when s.PENSION_HANDLE = 1 then "
派增
办理成功"
when s.PENSION_HANDLE = 2 then "
派增
办理失败"
when s.PENSION_HANDLE = 3 then "已派减"
when s.PENSION_HANDLE = 4 then "派减失败"
when s.PENSION_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.PENSION_HANDLE = 0 then "待办理"
when s.PENSION_HANDLE = 1 then "
待办理
"
when s.PENSION_HANDLE = 2 then "
待办理
"
case when s.PENSION_HANDLE = 0 then "
派增
待办理"
when s.PENSION_HANDLE = 1 then "
派增办理成功
"
when s.PENSION_HANDLE = 2 then "
派增办理失败
"
when s.PENSION_HANDLE = 3 then "已派减"
when s.PENSION_HANDLE = 4 then "派减失败"
when s.PENSION_HANDLE = 5 then "派减待办理"
else null end,""
))
as PENSION_HANDLE,
IF(a.TYPE='0',
case when s.MEDICAL_HANDLE = 0 then "待办理"
when s.MEDICAL_HANDLE = 1 then "办理成功"
when s.MEDICAL_HANDLE = 2 then "办理失败"
case when s.MEDICAL_HANDLE = 0 then "
派增
待办理"
when s.MEDICAL_HANDLE = 1 then "
派增
办理成功"
when s.MEDICAL_HANDLE = 2 then "
派增
办理失败"
when s.MEDICAL_HANDLE = 3 then "已派减"
when s.MEDICAL_HANDLE = 4 then "派减失败"
when s.MEDICAL_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.MEDICAL_HANDLE = 0 then "待办理"
when s.MEDICAL_HANDLE = 1 then "
待办理
"
when s.MEDICAL_HANDLE = 2 then "
待办理
"
case when s.MEDICAL_HANDLE = 0 then "
派增
待办理"
when s.MEDICAL_HANDLE = 1 then "
派增办理成功
"
when s.MEDICAL_HANDLE = 2 then "
派增办理失败
"
when s.MEDICAL_HANDLE = 3 then "已派减"
when s.MEDICAL_HANDLE = 4 then "派减失败"
when s.MEDICAL_HANDLE = 5 then "派减待办理"
else null end,""
))
as MEDICAL_HANDLE,
IF(a.TYPE='0',
case when s.UNEMPLOY_HANDLE = 0 then "待办理"
when s.UNEMPLOY_HANDLE = 1 then "办理成功"
when s.UNEMPLOY_HANDLE = 2 then "办理失败"
case when s.UNEMPLOY_HANDLE = 0 then "
派增
待办理"
when s.UNEMPLOY_HANDLE = 1 then "
派增
办理成功"
when s.UNEMPLOY_HANDLE = 2 then "
派增
办理失败"
when s.UNEMPLOY_HANDLE = 3 then "已派减"
when s.UNEMPLOY_HANDLE = 4 then "派减失败"
when s.UNEMPLOY_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.UNEMPLOY_HANDLE = 0 then "待办理"
when s.UNEMPLOY_HANDLE = 1 then "
待办理
"
when s.UNEMPLOY_HANDLE = 2 then "
待办理
"
case when s.UNEMPLOY_HANDLE = 0 then "
派增
待办理"
when s.UNEMPLOY_HANDLE = 1 then "
派增办理成功
"
when s.UNEMPLOY_HANDLE = 2 then "
派增办理失败
"
when s.UNEMPLOY_HANDLE = 3 then "已派减"
when s.UNEMPLOY_HANDLE = 4 then "派减失败"
when s.UNEMPLOY_HANDLE = 5 then "派减待办理"
else null end,""
))
as UNEMPLOY_HANDLE,
IF(a.TYPE='0',
case when s.WORK_INJURY_HANDLE = 0 then "待办理"
when s.WORK_INJURY_HANDLE = 1 then "办理成功"
when s.WORK_INJURY_HANDLE = 2 then "办理失败"
case when s.WORK_INJURY_HANDLE = 0 then "
派增
待办理"
when s.WORK_INJURY_HANDLE = 1 then "
派增
办理成功"
when s.WORK_INJURY_HANDLE = 2 then "
派增
办理失败"
when s.WORK_INJURY_HANDLE = 3 then "已派减"
when s.WORK_INJURY_HANDLE = 4 then "派减失败"
when s.WORK_INJURY_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.WORK_INJURY_HANDLE = 0 then "待办理"
when s.WORK_INJURY_HANDLE = 1 then "
待办理
"
when s.WORK_INJURY_HANDLE = 2 then "
待办理
"
case when s.WORK_INJURY_HANDLE = 0 then "
派增
待办理"
when s.WORK_INJURY_HANDLE = 1 then "
派增办理成功
"
when s.WORK_INJURY_HANDLE = 2 then "
派增办理失败
"
when s.WORK_INJURY_HANDLE = 3 then "已派减"
when s.WORK_INJURY_HANDLE = 4 then "派减失败"
when s.WORK_INJURY_HANDLE = 5 then "派减待办理"
else null end,""
))
as WORK_INJURY_HANDLE,
IF(a.TYPE='0',
case when s.BIRTH_HANDLE = 0 then "待办理"
when s.BIRTH_HANDLE = 1 then "办理成功"
when s.BIRTH_HANDLE = 2 then "办理失败"
case when s.BIRTH_HANDLE = 0 then "
派增
待办理"
when s.BIRTH_HANDLE = 1 then "
派增
办理成功"
when s.BIRTH_HANDLE = 2 then "
派增
办理失败"
when s.BIRTH_HANDLE = 3 then "已派减"
when s.BIRTH_HANDLE = 4 then "派减失败"
when s.BIRTH_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.BIRTH_HANDLE = 0 then "待办理"
when s.BIRTH_HANDLE = 1 then "
待办理
"
when s.BIRTH_HANDLE = 2 then "
待办理
"
case when s.BIRTH_HANDLE = 0 then "
派增
待办理"
when s.BIRTH_HANDLE = 1 then "
派增办理成功
"
when s.BIRTH_HANDLE = 2 then "
派增办理失败
"
when s.BIRTH_HANDLE = 3 then "已派减"
when s.BIRTH_HANDLE = 4 then "派减失败"
when s.BIRTH_HANDLE = 5 then "派减待办理"
else null end,""
))
as BIRTH_HANDLE,
IF(a.TYPE='0',
case when s.BIGAILMENT_HANDLE = 0 then "待办理"
when s.BIGAILMENT_HANDLE = 1 then "办理成功"
when s.BIGAILMENT_HANDLE = 2 then "办理失败"
case when s.BIGAILMENT_HANDLE = 0 then "
派增
待办理"
when s.BIGAILMENT_HANDLE = 1 then "
派增
办理成功"
when s.BIGAILMENT_HANDLE = 2 then "
派增
办理失败"
when s.BIGAILMENT_HANDLE = 3 then "已派减"
when s.BIGAILMENT_HANDLE = 4 then "派减失败"
when s.BIGAILMENT_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.BIGAILMENT_HANDLE = 0 then "待办理"
when s.BIGAILMENT_HANDLE = 1 then "
待办理
"
when s.BIGAILMENT_HANDLE = 2 then "
待办理
"
case when s.BIGAILMENT_HANDLE = 0 then "
派增
待办理"
when s.BIGAILMENT_HANDLE = 1 then "
派增办理成功
"
when s.BIGAILMENT_HANDLE = 2 then "
派增办理失败
"
when s.BIGAILMENT_HANDLE = 3 then "已派减"
when s.BIGAILMENT_HANDLE = 4 then "派减失败"
when s.BIGAILMENT_HANDLE = 5 then "派减待办理"
else null end,""
))
as BIGAILMENT_HANDLE,
case when a.FUND_HANDLE_STATUS = 0 then "待办理"
when a.FUND_HANDLE_STATUS = 1 then "办理成功"
when a.FUND_HANDLE_STATUS = 2 then "办理失败"
case when a.FUND_HANDLE_STATUS = 0 then "
派增
待办理"
when a.FUND_HANDLE_STATUS = 1 then "
派增
办理成功"
when a.FUND_HANDLE_STATUS = 2 then "
派增
办理失败"
when a.FUND_HANDLE_STATUS = 3 then "已派减"
else null end as FUND_HANDLE_STATUS,
a.CREATE_NAME,
...
...
@@ -932,12 +944,18 @@
SELECT
a.TYPE,
a.SOCIAL_HANDLE_STATUS,
IF(a.TYPE='0',s.PENSION_HANDLE,IF(s.PENSION_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "PENSION_HANDLE",
/*
IF(a.TYPE='0',s.PENSION_HANDLE,IF(s.PENSION_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "PENSION_HANDLE",
IF(a.TYPE='0',s.MEDICAL_HANDLE,IF(s.MEDICAL_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "MEDICAL_HANDLE",
IF(a.TYPE='0',s.UNEMPLOY_HANDLE,IF(s.UNEMPLOY_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "UNEMPLOY_HANDLE",
IF(a.TYPE='0',s.WORK_INJURY_HANDLE,IF(s.WORK_INJURY_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "WORK_INJURY_HANDLE",
IF(a.TYPE='0',s.BIRTH_HANDLE,IF(s.BIRTH_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "BIRTH_HANDLE",
IF(a.TYPE='0',s.BIGAILMENT_HANDLE,IF(s.BIGAILMENT_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "BIGAILMENT_HANDLE",
IF(a.TYPE='0',s.BIGAILMENT_HANDLE,IF(s.BIGAILMENT_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "BIGAILMENT_HANDLE",*/
s.PENSION_HANDLE,
s.MEDICAL_HANDLE,
s.UNEMPLOY_HANDLE,
s.WORK_INJURY_HANDLE,
s.BIRTH_HANDLE,
s.BIGAILMENT_HANDLE,
a.EMP_NAME,
a.EMP_IDCARD,
a.EDUCATION_NAME,
...
...
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