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
c6ee8f6f
Commit
c6ee8f6f
authored
Feb 13, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派减分项办理
parent
b42cb475
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
33 additions
and
12 deletions
+33
-12
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+33
-12
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
c6ee8f6f
...
...
@@ -3058,7 +3058,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
else
if
(
CommonConstants
.
ONE_INT
==
flag
)
{
// 作废更新:社保状态、同步预估数据 8 审核不通过直接作废
sf
.
setSocialReduceStatus
(
CommonConstants
.
ONE_STRING_NEGATE
);
sf
.
setSocialStatus
(
CommonConstants
.
THREE_STRING
);
if
(
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getPensionHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getMedicalHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getWorkInjuryHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getBirthHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getUnemployHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getBigailmentHandle
())
){
sf
.
setSocialStatus
(
CommonConstants
.
FOUR_STRING
);
}
else
{
sf
.
setSocialStatus
(
CommonConstants
.
THREE_STRING
);
}
sf
.
setSocialReduceDate
(
null
);
}
}
...
...
@@ -3459,7 +3469,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
continue
;
}
socialInfo
=
socialMapper
.
selectById
(
dis
.
getSocialId
());
socialTypeRemark
=
getHandleRemark
(
socialType
,
socialInfo
,
dis
.
getType
());
socialTypeRemark
=
getHandleRemark
(
socialType
,
socialInfo
,
dis
.
getType
()
,
sf
);
// 无更新直接跳过
if
(
Common
.
isEmpty
(
socialTypeRemark
.
toString
()))
{
continue
;
...
...
@@ -3898,7 +3908,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @Param socialType 派单项(1养老 2医疗 3失业 4工伤 5生育 6大病),socialInfo 社保信息 type 0 派增 1 派减
* @return
**/
private
StringBuilder
getHandleRemark
(
String
socialType
,
TSocialInfo
socialInfo
,
String
type
)
{
private
StringBuilder
getHandleRemark
(
String
socialType
,
TSocialInfo
socialInfo
,
String
type
,
TSocialFundInfo
sf
)
{
StringBuilder
socialTypeRemark
;
socialTypeRemark
=
new
StringBuilder
();
if
(
Common
.
isNotNull
(
socialType
))
{
...
...
@@ -3938,28 +3948,27 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
for
(
String
st
:
stArr
)
{
// socialType (1养老 2医疗 3失业 4工伤 5生育 6大病)
if
(
Integer
.
parseInt
(
st
)
==
CommonConstants
.
ONE_INT
&&
CommonConstants
.
FIVE_STRING
.
equals
(
s
ocialInfo
.
getPensionHandle
())){
&&
CommonConstants
.
FIVE_STRING
.
equals
(
s
f
.
getPensionHandle
())){
socialTypeRemark
.
append
(
CommonConstants
.
SOCIAL_HANDLE_TYPE
[
Integer
.
parseInt
(
st
)]).
append
(
"、"
);
}
if
(
Integer
.
parseInt
(
st
)
==
CommonConstants
.
TWO_INT
&&
CommonConstants
.
FIVE_STRING
.
equals
(
s
ocialInfo
.
getMedicalHandle
())){
&&
CommonConstants
.
FIVE_STRING
.
equals
(
s
f
.
getMedicalHandle
())){
socialTypeRemark
.
append
(
CommonConstants
.
SOCIAL_HANDLE_TYPE
[
Integer
.
parseInt
(
st
)]).
append
(
"、"
);
}
if
(
Integer
.
parseInt
(
st
)
==
CommonConstants
.
THREE_INT
&&
CommonConstants
.
FIVE_STRING
.
equals
(
s
ocialInfo
.
getUnemployHandle
())){
&&
CommonConstants
.
FIVE_STRING
.
equals
(
s
f
.
getUnemployHandle
())){
socialTypeRemark
.
append
(
CommonConstants
.
SOCIAL_HANDLE_TYPE
[
Integer
.
parseInt
(
st
)]).
append
(
"、"
);
}
if
(
Integer
.
parseInt
(
st
)
==
CommonConstants
.
FOUR_INT
&&
CommonConstants
.
FIVE_STRING
.
equals
(
s
ocialInfo
.
getWorkInjuryHandle
())){
&&
CommonConstants
.
FIVE_STRING
.
equals
(
s
f
.
getWorkInjuryHandle
())){
socialTypeRemark
.
append
(
CommonConstants
.
SOCIAL_HANDLE_TYPE
[
Integer
.
parseInt
(
st
)]).
append
(
"、"
);
}
if
(
Integer
.
parseInt
(
st
)
==
CommonConstants
.
FIVE_INT
&&
CommonConstants
.
FIVE_STRING
.
equals
(
s
ocialInfo
.
getBirthHandle
())){
&&
CommonConstants
.
FIVE_STRING
.
equals
(
s
f
.
getBirthHandle
())){
socialTypeRemark
.
append
(
CommonConstants
.
SOCIAL_HANDLE_TYPE
[
Integer
.
parseInt
(
st
)]).
append
(
"、"
);
}
if
(
Integer
.
parseInt
(
st
)
==
CommonConstants
.
SIX_INT
&&
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
())){
&&
CommonConstants
.
FIVE_STRING
.
equals
(
sf
.
getBigailmentHandle
())){
socialTypeRemark
.
append
(
CommonConstants
.
SOCIAL_HANDLE_TYPE
[
Integer
.
parseInt
(
st
)]).
append
(
"、"
);
}
}
...
...
@@ -4088,17 +4097,23 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
void
initReduceStatus
(
TSocialInfo
socialInfo
,
TSocialFundInfo
sf
,
TDispatchInfo
dis
)
{
// 全部失败
if
((
CommonConstants
.
FOUR_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
Common
.
isEmpty
(
socialInfo
.
getPensionHandle
()))
&&
(
CommonConstants
.
FOUR_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())
||
Common
.
isEmpty
(
socialInfo
.
getMedicalHandle
()))
&&
(
CommonConstants
.
FOUR_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
||
Common
.
isEmpty
(
socialInfo
.
getWorkInjuryHandle
()))
&&
(
CommonConstants
.
FOUR_STRING
.
equals
(
socialInfo
.
getBirthHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getBirthHandle
())
||
Common
.
isEmpty
(
socialInfo
.
getBirthHandle
()))
&&
(
CommonConstants
.
FOUR_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
||
Common
.
isEmpty
(
socialInfo
.
getUnemployHandle
()))
&&
(
(
CommonConstants
.
FOUR_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
((
CommonConstants
.
FOUR_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
()))
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
())
)
||
Common
.
isEmpty
(
socialInfo
.
getBigailmentHandle
()))
...
...
@@ -4112,17 +4127,23 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 全部成功
if
((
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
Common
.
isEmpty
(
socialInfo
.
getPensionHandle
()))
&&
(
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())
||
Common
.
isEmpty
(
socialInfo
.
getMedicalHandle
()))
&&
(
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
||
Common
.
isEmpty
(
socialInfo
.
getWorkInjuryHandle
()))
&&
(
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getBirthHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getBirthHandle
())
||
Common
.
isEmpty
(
socialInfo
.
getBirthHandle
()))
&&
(
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
||
Common
.
isEmpty
(
socialInfo
.
getUnemployHandle
()))
&&
(
(
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
(
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
()))
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
()))
||
Common
.
isEmpty
(
socialInfo
.
getBigailmentHandle
()))
){
...
...
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