Commit daac2199 authored by fangxinjiang's avatar fangxinjiang

实缴导出优化-fxj

parent 08024472
......@@ -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));
}
/**
......
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