Commit d578d1ca authored by fangxinjiang's avatar fangxinjiang

实缴导出优化-fxj

parent 7b127afa
...@@ -5253,18 +5253,32 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -5253,18 +5253,32 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
@Override @Override
public R<Integer> listSumExportCheck(HttpServletResponse response, TPaymentInfoSearchVo searchVo){ public R<Integer> listSumExportCheck(HttpServletResponse response, TPaymentInfoSearchVo searchVo){
if (Common.isEmpty(searchVo.getEmpIdcard()) if (Common.isEmpty(searchVo.getEmpIdcard())
&& Common.isEmpty(searchVo.getSocialSecurityNo())
&& Common.isEmpty(searchVo.getUnitName()) && Common.isEmpty(searchVo.getUnitName())
&& Common.isEmpty(searchVo.getSettleDomainName()) && Common.isEmpty(searchVo.getSettleDomainName())
&& Common.isEmpty(searchVo.getSocialCreateMonth()) && Common.isEmpty(searchVo.getSocialCreateMonth())
&& Common.isEmpty(searchVo.getSocialPayMonth()) && Common.isEmpty(searchVo.getSocialPayMonth())
&& Common.isEmpty(searchVo.getSocialProvince()) && Common.isEmpty(searchVo.getSocialProvince())
&& Common.isEmpty(searchVo.getSecondIndicatorBelong())){ && Common.isEmpty(searchVo.getCreateName())
&& null == searchVo.getCreateTimeEnd()
&& Common.isEmpty(searchVo.getSecondIndicatorBelong())
&& Common.isEmpty(searchVo.getPushStatus())
&& Common.isEmpty(searchVo.getLockStatus())
){
// 只有社保户 // 只有社保户
if (Common.isNotNull(searchVo.getSocialHousehold())){ if (Common.isNotNull(searchVo.getSocialHousehold()) && !Common.isNotNull(searchVo.getProvidentHousehold())){
//特殊处理皖信户
if ("安徽皖信人力资源管理有限公司".equals(searchVo.getSocialHousehold())){
return R.ok(20001);
}
return R.ok(baseMapper.selectCountPaymentSearchInfoSocialByLimit(searchVo)); return R.ok(baseMapper.selectCountPaymentSearchInfoSocialByLimit(searchVo));
} }
//只有公积金户 //只有公积金户
if (Common.isNotNull(searchVo.getProvidentHousehold())){ if (Common.isNotNull(searchVo.getProvidentHousehold()) && !Common.isNotNull(searchVo.getSocialHousehold())){
//特殊处理皖信户
if ("安徽皖信人力资源管理有限公司".equals(searchVo.getProvidentHousehold())){
return R.ok(20001);
}
return R.ok(baseMapper.selectCountPaymentSearchInfoSocialByLimit(searchVo)); return R.ok(baseMapper.selectCountPaymentSearchInfoSocialByLimit(searchVo));
} }
} }
......
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