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
9aad7859
Commit
9aad7859
authored
Sep 14, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-实缴导入逻辑修改
parent
67b05662
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
3 deletions
+23
-3
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+23
-3
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
9aad7859
...
...
@@ -1213,7 +1213,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
socialist
=
socialInfoMapper
.
selectList
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TSocialInfo:
:
getSocialProvince
,
infoVo
.
getSocialProvince
())
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
()));
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
())
.
and
(
obj
->
obj
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
ONE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
FIVE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
SEVEN_STRING
)
)
);
if
(
CollectionUtils
.
isNotEmpty
(
socialist
))
{
for
(
TSocialInfo
socialInfo1
:
socialist
)
{
if
((
Common
.
isEmpty
(
infoVo
.
getSocialTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getSocialTown
())
&&
...
...
@@ -2874,7 +2881,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
socialist
=
socialInfoMapper
.
selectList
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TSocialInfo:
:
getSocialProvince
,
infoVo
.
getSocialProvince
().
toString
())
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
().
toString
()));
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
().
toString
())
.
and
(
obj
->
obj
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
ONE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
FIVE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
SEVEN_STRING
)
)
);
if
(
CollectionUtils
.
isNotEmpty
(
socialist
))
{
for
(
TSocialInfo
socialInfo1
:
socialist
)
{
if
((
Common
.
isEmpty
(
infoVo
.
getSocialTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getSocialTown
())
&&
...
...
@@ -3342,7 +3356,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
socialist
=
socialInfoMapper
.
selectList
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TSocialInfo:
:
getSocialProvince
,
infoVo
.
getSocialProvince
().
toString
())
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
().
toString
()));
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
().
toString
())
.
and
(
obj
->
obj
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
ONE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
FIVE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
SEVEN_STRING
)
));
if
(
CollectionUtils
.
isNotEmpty
(
socialist
))
{
for
(
TSocialInfo
socialInfo1
:
socialist
)
{
if
((
Common
.
isEmpty
(
infoVo
.
getSocialTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getSocialTown
())
&&
...
...
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