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
d201c681
Commit
d201c681
authored
May 16, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.4-优化社保士兵
parent
7defff25
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
58 deletions
+49
-58
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+25
-50
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+24
-8
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
d201c681
...
...
@@ -4879,31 +4879,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf
.
setWorkInjuryReduceStart
(
null
);
}
}
// 单个办理的时候处理派单和社保的办理状态 有办理成功也有办理失败的 为办理中
if
((
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getBirthHandle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
||
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
()))
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())
||
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
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
())))
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getBirthHandle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
||
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
())))
){
socialInfo
.
setHandleStatus
(
CommonConstants
.
FOUR_STRING
);
}
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
dis
.
getAutoFlag
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
()))
{
...
...
@@ -4938,31 +4913,31 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf
.
setBigailmentReduceStart
(
null
);
}
}
// 单个办理的时候处理派单和社保的办理状态 有办理成功也有办理失败的 为办理中
if
((
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
CommonConstants
.
TWO
_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getMedical
Handle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getWorkInjury
Handle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getBirth
Handle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getUnemploy
Handle
())
||
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getBigailment
Handle
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
()
))
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getMedicalHandle
(
))
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getWorkInjury
Handle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getBirth
Handle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getUnemploy
Handle
())
||
(
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getBigailment
Handle
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
())
))
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getPensionHandle
(
))
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getMedical
Handle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getWorkInjury
Handle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getBirth
Handle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getUnemploy
Handle
())
||
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getBigailment
Handle
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
())
))
){
socialInfo
.
setHandleStatus
(
CommonConstants
.
FOUR_STRING
);
}
}
// 单个办理的时候处理派单和社保的办理状态 有办理成功也有办理失败的 为办理中
if
((
CommonConstants
.
ONE
_STRING
.
equals
(
socialInfo
.
getPensionHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getPension
Handle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getMedical
Handle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getWorkInjury
Handle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getBirth
Handle
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getUnemploy
Handle
())
||
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
(
))
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
()
))
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getMedical
Handle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getWorkInjury
Handle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getBirth
Handle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getUnemploy
Handle
())
||
(
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
(
))
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
())
))
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getPension
Handle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getMedical
Handle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getWorkInjury
Handle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getBirth
Handle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getUnemploy
Handle
())
||
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
(
))
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
())))
){
socialInfo
.
setHandleStatus
(
CommonConstants
.
FOUR_STRING
);
}
}
// 派减处理 办理成功才变更为已派减 3 ,办理失败 为4
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @
d201c681
...
...
@@ -481,8 +481,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
else
{
title
+=
"派减"
;
}
title
+=
"
派减养老、工伤、失业办理失败!继续办理"
;
this
.
doSocialTAuditInfo
(
socialInfo
,
title
,
"养老、工伤、失业办理失败!继续办理:"
+
excel
.
getMsg
(),
excel
.
getMsg
(),
user
);
title
+=
"
养老、工伤、失业办理失败!继续办理:"
+
failConfig
.
getSimpleReason
()
;
this
.
doSocialTAuditInfo
(
socialInfo
,
title
,
title
,
failConfig
.
getSimpleReason
(),
user
);
}
else
if
(
CommonConstants
.
TWO_STRING
.
equals
(
failConfig
.
getReplay
()))
{
ygsHandleStatus
=
CommonConstants
.
FOUR_STRING
;
ygsFailList
=
new
ArrayList
<>();
...
...
@@ -498,11 +498,19 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
else
{
title
+=
"派减"
;
}
title
+=
"
派减养老、工伤、失业办理失败!人工处理"
;
this
.
doSocialTAuditInfo
(
socialInfo
,
title
,
"养老、工伤、失业办理失败!人工处理:"
+
excel
.
getMsg
(),
excel
.
getMsg
(),
user
);
title
+=
"
养老、工伤、失业办理失败!人工处理:"
+
failConfig
.
getSimpleReason
()
;
this
.
doSocialTAuditInfo
(
socialInfo
,
title
,
title
,
failConfig
.
getSimpleReason
(),
user
);
}
}
else
{
ygsHandleStatus
=
CommonConstants
.
FIVE_STRING
;
// 新增流程进展明细
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getDispatchType
()))
{
title
+=
"派增"
;
}
else
{
title
+=
"派减"
;
}
title
+=
"养老、工伤、失业办理失败!人工处理:"
+
excel
.
getMsg
();
this
.
doSocialTAuditInfo
(
socialInfo
,
title
,
"养老、工伤、失业办理失败!人工处理:"
+
excel
.
getMsg
(),
excel
.
getMsg
(),
user
);
}
}
}
...
...
@@ -551,8 +559,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
else
{
title
+=
"派减"
;
}
title
+=
"
派减医疗、生育、大病办理失败!继续办理"
;
this
.
doSocialTAuditInfo
(
socialInfo
,
title
,
"医疗、生育、大病办理失败!继续办理:"
+
excel
.
getMsg
(),
excel
.
getMsg
(),
user
);
title
+=
"
医疗、生育、大病办理失败!继续办理:"
+
failConfig
.
getSimpleReason
()
;
this
.
doSocialTAuditInfo
(
socialInfo
,
title
,
title
,
failConfig
.
getSimpleReason
(),
user
);
}
else
if
(
CommonConstants
.
TWO_STRING
.
equals
(
failConfig
.
getReplay
()))
{
ysdHandleStatus
=
CommonConstants
.
FOUR_STRING
;
ysdFailList
=
new
ArrayList
<>();
...
...
@@ -567,11 +575,19 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
else
{
title
+=
"派减"
;
}
title
+=
"
派减医疗、生育、大病办理失败!人工处理"
;
this
.
doSocialTAuditInfo
(
socialInfo
,
title
,
"医疗、生育、大病办理失败!人工处理:"
+
excel
.
getMsg
(),
excel
.
getMsg
(),
user
);
title
+=
"
医疗、生育、大病办理失败!人工处理:"
+
failConfig
.
getSimpleReason
()
;
this
.
doSocialTAuditInfo
(
socialInfo
,
title
,
"医疗、生育、大病办理失败!人工处理:"
+
failConfig
.
getSimpleReason
(),
failConfig
.
getSimpleReason
(),
user
);
}
}
else
{
ysdHandleStatus
=
CommonConstants
.
FIVE_STRING
;
// 新增流程进展明细
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getDispatchType
()))
{
title
+=
"派增"
;
}
else
{
title
+=
"派减"
;
}
title
+=
"医疗、生育、大病办理失败!人工处理:"
+
excel
.
getMsg
();
this
.
doSocialTAuditInfo
(
socialInfo
,
title
,
"医疗、生育、大病办理失败!人工处理:"
+
excel
.
getMsg
(),
excel
.
getMsg
(),
user
);
}
}
}
...
...
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