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
daac2199
Commit
daac2199
authored
Mar 04, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
实缴导出优化-fxj
parent
08024472
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
3 deletions
+13
-3
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+13
-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 @
daac2199
...
...
@@ -5252,7 +5252,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
**/
@Override
public
R
<
Integer
>
listSumExportCheck
(
HttpServletResponse
response
,
TPaymentInfoSearchVo
searchVo
){
if
(
Common
.
isEmpty
(
searchVo
.
getEmpIdcard
())
boolean
flag
=
Common
.
isEmpty
(
searchVo
.
getEmpIdcard
())
&&
Common
.
isEmpty
(
searchVo
.
getSocialSecurityNo
())
&&
Common
.
isEmpty
(
searchVo
.
getUnitName
())
&&
Common
.
isEmpty
(
searchVo
.
getSettleDomainName
())
...
...
@@ -5263,8 +5263,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
&&
null
==
searchVo
.
getCreateTimeEnd
()
&&
Common
.
isEmpty
(
searchVo
.
getSecondIndicatorBelong
())
&&
Common
.
isEmpty
(
searchVo
.
getPushStatus
())
&&
Common
.
isEmpty
(
searchVo
.
getLockStatus
())
){
&&
Common
.
isEmpty
(
searchVo
.
getLockStatus
());
// 单独处理户数据查询
if
(
false
&&
Common
.
isEmpty
(
searchVo
.
getSocialProvince
())){
// 只有社保户
if
(
Common
.
isNotNull
(
searchVo
.
getSocialHousehold
())
&&
!
Common
.
isNotNull
(
searchVo
.
getProvidentHousehold
())){
//特殊处理皖信户
...
...
@@ -5282,6 +5283,15 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
return
R
.
ok
(
baseMapper
.
selectCountPaymentSearchInfoSocialByLimit
(
searchVo
));
}
}
// 单独处理区域数据
if
(
false
&&
Common
.
isEmpty
(
searchVo
.
getSocialHousehold
())
&&
Common
.
isEmpty
(
searchVo
.
getProvidentHousehold
())
&&
!
Common
.
isEmpty
(
searchVo
.
getSocialProvince
())){
if
((
Common
.
isEmpty
(
searchVo
.
getSocialCity
())
&&
"12"
.
equals
(
searchVo
.
getSocialProvince
()))
||(
Common
.
isEmpty
(
searchVo
.
getSocialTown
())
&&
"135"
.
equals
(
searchVo
.
getSocialProvince
()))){
return
R
.
ok
(
20001
);
}
}
return
R
.
ok
(
baseMapper
.
selectCountSumPaymentInfo
(
searchVo
));
}
/**
...
...
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