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
9e54e0ca
Commit
9e54e0ca
authored
May 20, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.4-优化社保士兵
parent
6f9e646b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+5
-5
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+2
-4
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
9e54e0ca
...
@@ -3434,8 +3434,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3434,8 +3434,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getWorkInjuryHandle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
)
&&
CommonConstants
.
ZERO_STRING
.
equals
(
autoFlag
))
)
{
&&
CommonConstants
.
ZERO_STRING
.
equals
(
autoFlag
))
{
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
ONE_STRING
);
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
ONE_STRING
);
}
}
if
((
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())
if
((
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())
...
@@ -3443,9 +3443,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3443,9 +3443,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getBirthHandle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getBirthHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getBirthHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getBirthHandle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
)
&&
CommonConstants
.
ZERO_STRING
.
equals
(
autoFlag
))
)
{
&&
CommonConstants
.
ZERO_STRING
.
equals
(
autoFlag
))
{
socialInfo
.
setY
gs
HandleStatus
(
CommonConstants
.
ONE_STRING
);
socialInfo
.
setY
sd
HandleStatus
(
CommonConstants
.
ONE_STRING
);
}
}
}
}
socialMapper
.
updateById
(
socialInfo
);
socialMapper
.
updateById
(
socialInfo
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @
9e54e0ca
...
@@ -384,8 +384,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -384,8 +384,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
if
(
typeFlag
&&
if
(
typeFlag
&&
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
())
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
())
||
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
())
||
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
())))
{
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
())))
{
updateSocial
=
socialMap
.
get
(
socialInfo
.
getId
());
updateSocial
=
socialMap
.
get
(
socialInfo
.
getId
());
if
(
updateSocial
==
null
)
{
if
(
updateSocial
==
null
)
{
updateSocial
=
new
TSocialInfo
();
updateSocial
=
new
TSocialInfo
();
...
@@ -473,8 +472,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -473,8 +472,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
else
if
(!
typeFlag
&&
}
else
if
(!
typeFlag
&&
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
())
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
())
||
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
())
||
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
())))
{
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
())))
{
updateSocial
=
socialMap
.
get
(
socialInfo
.
getId
());
updateSocial
=
socialMap
.
get
(
socialInfo
.
getId
());
if
(
updateSocial
==
null
)
{
if
(
updateSocial
==
null
)
{
updateSocial
=
new
TSocialInfo
();
updateSocial
=
new
TSocialInfo
();
...
...
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