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
c0551da7
Commit
c0551da7
authored
Aug 09, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
实缴查询优化-fxj
parent
1f73fc85
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
42 deletions
+1
-42
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+1
-42
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
c0551da7
...
...
@@ -222,13 +222,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
pageData
=
baseMapper
.
getTPaymentInfoNewPageSocial
(
searchVo
,
(
pageNew
.
getCurrent
()
-
1
)
*
pageNew
.
getSize
(),
pageNew
.
getSize
());
//封装对应的社保及公积金的合计数据处理
if
(
Common
.
isNotNull
(
pageData
)){
HashMap
<
String
,
TPaymentInfoNewVo
>
newVoHashMap
=
new
HashMap
<>();
String
key
;
TPaymentInfoExportVo
newVo
;
for
(
TPaymentInfoNewVo
vo:
pageData
){
key
=
vo
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
vo
.
getSocialPayMonth
()+
CommonConstants
.
DOWN_LINE_STRING
+
vo
.
getSocialCreateMonth
();
newVo
=
baseMapper
.
getSumByKeyGroupSocial
(
vo
.
getEmpIdcard
(),
vo
.
getSocialPayMonth
(),
vo
.
getSocialCreateMonth
());
if
(
null
!=
newVo
){
vo
.
setSumAll
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
newVo
.
getSumAll
()),
BigDecimalUtils
.
isNullToZero
(
newVo
.
getSocialSum
())));
...
...
@@ -243,45 +238,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
vo
.
setProvidentHousehold
(
newVo
.
getProvidentHousehold
());
vo
.
setProvidentPayAddr
(
newVo
.
getProvidentPayAddr
());
}
newVoHashMap
.
put
(
key
,
vo
)
;
return
pageData
;
}
List
<
TPaymentInfoNewVo
>
pageDataHandle
=
new
ArrayList
<>();
/*
List<TPaymentInfoExportVo> pageDataSumSocial = baseMapper.getSumByKeyGroupSocial(keyGroup);
if (Common.isNotNull(pageDataSumSocial)){
TPaymentInfoNewVo newVo;
for (TPaymentInfoExportVo exportVo:pageDataSumSocial){
newVo = newVoHashMap.get(exportVo.getKeyGroup());
if (null != newVo){
newVo.setSumAll(BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(newVo.getSumAll()),BigDecimalUtils.isNullToZero(exportVo.getSocialSum())));
newVo.setSocialSum(exportVo.getSocialSum());
newVo.setSocialPayAddr(exportVo.getSocialPayAddr());
newVo.setSocialHousehold(exportVo.getSocialHousehold());
}
newVoHashMap.put(exportVo.getKeyGroup(),newVo);
}
}
List<TPaymentInfoExportVo> pageDataSumFund = baseMapper.getSumByKeyGroupFund(keyGroup);
if (Common.isNotNull(pageDataSumFund)){
TPaymentInfoNewVo newVo;
for (TPaymentInfoExportVo exportVo:pageDataSumFund){
newVo = newVoHashMap.get(exportVo.getKeyGroup());
if (null != newVo){
newVo.setSumAll(BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(newVo.getSumAll()),BigDecimalUtils.isNullToZero(exportVo.getProvidentSum())));
newVo.setProvidentSum(exportVo.getProvidentSum());
newVo.setProvidentHousehold(exportVo.getProvidentHousehold());
newVo.setProvidentPayAddr(exportVo.getProvidentPayAddr());
}
newVoHashMap.put(exportVo.getKeyGroup(),newVo);
}
}*/
if
(
Common
.
isNotNull
(
newVoHashMap
)){
for
(
TPaymentInfoNewVo
k:
newVoHashMap
.
values
()){
pageDataHandle
.
add
(
k
);
}
return
pageDataHandle
;
}
}
// 身份证查询 项目查询直接走原查询逻辑,因为此处数据量不会很大
}
else
{
...
...
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