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
d5be4c84
Commit
d5be4c84
authored
Jun 07, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
5199fba6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+4
-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 @
d5be4c84
...
...
@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.CollectionUtils
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
...
...
@@ -1057,7 +1058,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TSocialInfo:
:
getSocialProvince
,
infoVo
.
getSocialProvince
())
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
()));
if
(
!
socialist
.
isEmpty
(
))
{
if
(
CollectionUtils
.
isNotEmpty
(
socialist
))
{
for
(
TSocialInfo
socialInfo1
:
socialist
)
{
if
((
Common
.
isEmpty
(
infoVo
.
getSocialTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getSocialTown
())
&&
infoVo
.
getSocialTown
().
equals
(
socialInfo1
.
getSocialTown
())))
&&
...
...
@@ -1793,7 +1794,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.
eq
(
TProvidentFund:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TProvidentFund:
:
getFundProvince
,
infoVo
.
getFundProvince
())
.
eq
(
TProvidentFund:
:
getFundCity
,
infoVo
.
getFundCity
()));
if
(
!
fundlist
.
isEmpty
(
))
{
if
(
CollectionUtils
.
isNotEmpty
(
fundlist
))
{
for
(
TProvidentFund
providentFund
:
fundlist
)
{
if
((
Common
.
isEmpty
(
infoVo
.
getFundTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getFundTown
())
&&
infoVo
.
getFundTown
().
equals
(
providentFund
.
getFundTown
())))
&&
...
...
@@ -2305,7 +2306,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TSocialInfo:
:
getSocialProvince
,
infoVo
.
getSocialProvince
().
toString
())
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
().
toString
()));
if
(
!
socialist
.
isEmpty
(
))
{
if
(
CollectionUtils
.
isNotEmpty
(
socialist
))
{
for
(
TSocialInfo
socialInfo1
:
socialist
)
{
if
((
Common
.
isEmpty
(
infoVo
.
getSocialTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getSocialTown
())
&&
infoVo
.
getSocialTown
().
toString
().
equals
(
socialInfo1
.
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