Skip to content

Y
yifu-mvp
Commit d090f758 authored by hongguangwu's avatar hongguangwu
Browse files
Options

MVP1.4-B端社保、档案

parent f36f00b6
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 8 deletions
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ d090f758
...@@ -3390,17 +3390,22 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -3390,17 +3390,22 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
HashMap<String,PaymentBusinessPageVo> pageVoHashMap = new HashMap<>(); HashMap<String,PaymentBusinessPageVo> pageVoHashMap = new HashMap<>();
if (Common.isNotNull(paymentAllInfoVoList)){ if (Common.isNotNull(paymentAllInfoVoList)){
PaymentBusinessPageVo pageVo; PaymentBusinessPageVo pageVo;
String payMonth;
for (TPaymentInfoVo infoVo:paymentAllInfoVoList){ for (TPaymentInfoVo infoVo:paymentAllInfoVoList){
pageVo = pageVoHashMap.get(infoVo.getSocialPayMonth()); payMonth = infoVo.getSocialPayMonth();
if (Common.isEmpty(payMonth)) {
payMonth = infoVo.getProvidentPayMonth();
}
if (Common.isNotNull(payMonth)){
pageVo = pageVoHashMap.get(payMonth);
if (null == pageVo){ if (null == pageVo){
pageVo = new PaymentBusinessPageVo(); pageVo = new PaymentBusinessPageVo();
} }
if (Common.isNotNull(infoVo.getSocialPayMonth())){ pageVo.setMonth(payMonth);
pageVo.setMonth(infoVo.getSocialPayMonth());
}
// 处理合计 // 处理合计
initPaymentSum(pageVo,false, infoVo); initPaymentSum(pageVo,false, infoVo);
pageVoHashMap.put(infoVo.getSocialPayMonth(),pageVo); pageVoHashMap.put(payMonth,pageVo);
}
} }
} }
if (Common.isNotNull(pageVoHashMap)){ if (Common.isNotNull(pageVoHashMap)){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment