Commit c0551da7 authored by fangxinjiang's avatar fangxinjiang

实缴查询优化-fxj

parent 1f73fc85
......@@ -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 {
......
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