Commit b72f4497 authored by fangxinjiang's avatar fangxinjiang

实缴查询优化-fxj

parent befeff69
......@@ -5384,6 +5384,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
@Override
public R<IPage<TPaymentInfo>> specialHandle(Page<TPaymentInfo> page, TPaymentInfoSearchVo tPaymentInfo) {
//确认为大户查询或安徽省或安徽省合肥市单独查询提示选择更多条件
String res = searchCheck(tPaymentInfo);
if (Common.isNotNull(res)){
return R.failed(res);
}
//判断社保户
if (socialFlag(tPaymentInfo)){
return getLock(page, tPaymentInfo);
......@@ -5397,6 +5402,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
@Override
public R<IPage<TPaymentInfoNewVo>> specialHandleNew(Page<TPaymentInfo> page, TPaymentInfoSearchVo tPaymentInfo) {
//确认为大户查询或安徽省或安徽省合肥市单独查询提示选择更多条件
String res = searchCheck(tPaymentInfo);
if (Common.isNotNull(res)){
return R.failed(res);
}
//判断社保户
if (socialFlag(tPaymentInfo)){
return getLockNew(page, tPaymentInfo);
......@@ -5480,4 +5490,44 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
}
public String searchCheck(TPaymentInfoSearchVo searchVo){
boolean flag = Common.isEmpty(searchVo.getEmpIdcard())
&& Common.isEmpty(searchVo.getSocialSecurityNo())
&& Common.isEmpty(searchVo.getUnitName())
&& Common.isEmpty(searchVo.getSettleDomainName())
&& Common.isEmpty(searchVo.getSocialCreateMonth())
&& Common.isEmpty(searchVo.getSocialPayMonth())
&& Common.isEmpty(searchVo.getCreateName())
&& null == searchVo.getCreateTimeEnd()
&& Common.isEmpty(searchVo.getSecondIndicatorBelong())
&& Common.isEmpty(searchVo.getPushStatus())
&& Common.isEmpty(searchVo.getLockStatus());
// 单独处理户数据查询
if (flag && Common.isEmpty(searchVo.getSocialProvince())){
// 只有社保户
if (Common.isNotNull(searchVo.getSocialHousehold()) && !Common.isNotNull(searchVo.getProvidentHousehold())){
//特殊处理皖信户
if ("安徽皖信人力资源管理有限公司".equals(searchVo.getSocialHousehold())){
return "当前条件查询量较大,请选择更多条件";
}
}
//只有公积金户
if (Common.isNotNull(searchVo.getProvidentHousehold()) && !Common.isNotNull(searchVo.getSocialHousehold())){
//特殊处理皖信户
if ("安徽皖信人力资源管理有限公司".equals(searchVo.getProvidentHousehold())){
return "当前条件查询量较大,请选择更多条件";
}
}
}
// 单独处理区域数据
if (flag && Common.isEmpty(searchVo.getSocialHousehold())
&& Common.isEmpty(searchVo.getProvidentHousehold())){
if ((Common.isEmpty(searchVo.getSocialCity()) && "12".equals(searchVo.getSocialProvince()))
||(Common.isEmpty(searchVo.getSocialTown()) && "135".equals(searchVo.getSocialCity()))){
return "当前条件查询量较大,请选择更多条件";
}
}
return null;
}
}
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