Commit 524f9505 authored by hongguangwu's avatar hongguangwu

1.7.20-实缴导入和实缴查询处的项目检索

parent 3803459c
...@@ -234,7 +234,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -234,7 +234,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
|| Common.isNotNull(searchVo.getUnitName()) || Common.isNotNull(searchVo.getUnitName())
|| Common.isNotNull(searchVo.getProvidentHousehold())) || Common.isNotNull(searchVo.getProvidentHousehold()))
&& Common.isEmpty(searchVo.getEmpIdcard()) && Common.isEmpty(searchVo.getEmpIdcard())
&& Common.isEmpty(searchVo.getSettleDomainName())){ && Common.isEmpty(searchVo.getSettleDomainName())
&& Common.isEmpty(searchVo.getSettleDomainCode())){
//批量查询太慢 只能缓存单个查询 走字段索引 //批量查询太慢 只能缓存单个查询 走字段索引
pageData = baseMapper.getTPaymentInfoNewPageSocial(searchVo, (pageNew.getCurrent() - 1) * pageNew.getSize(), pageNew.getSize()); pageData = baseMapper.getTPaymentInfoNewPageSocial(searchVo, (pageNew.getCurrent() - 1) * pageNew.getSize(), pageNew.getSize());
//封装对应的社保及公积金的合计数据处理 //封装对应的社保及公积金的合计数据处理
......
...@@ -961,6 +961,9 @@ ...@@ -961,6 +961,9 @@
<if test="tPaymentInfo.settleDomainName != null and tPaymentInfo.settleDomainName.trim() != ''"> <if test="tPaymentInfo.settleDomainName != null and tPaymentInfo.settleDomainName.trim() != ''">
AND a.SETTLE_DOMAIN_NAME = #{tPaymentInfo.settleDomainName} AND a.SETTLE_DOMAIN_NAME = #{tPaymentInfo.settleDomainName}
</if> </if>
<if test="tPaymentInfo.settleDomainCode != null and tPaymentInfo.settleDomainCode.trim() != ''">
AND a.SETTLE_DOMAIN_CODE = #{tPaymentInfo.settleDomainCode}
</if>
<if test="tPaymentInfo.unitName != null and tPaymentInfo.unitName.trim() != ''"> <if test="tPaymentInfo.unitName != null and tPaymentInfo.unitName.trim() != ''">
AND a.UNIT_NAME = #{tPaymentInfo.unitName} AND a.UNIT_NAME = #{tPaymentInfo.unitName}
</if> </if>
...@@ -1151,6 +1154,9 @@ ...@@ -1151,6 +1154,9 @@
<if test="tPaymentInfo.settleDomainName != null and tPaymentInfo.settleDomainName.trim() != ''"> <if test="tPaymentInfo.settleDomainName != null and tPaymentInfo.settleDomainName.trim() != ''">
AND a.SETTLE_DOMAIN_NAME = #{tPaymentInfo.settleDomainName} AND a.SETTLE_DOMAIN_NAME = #{tPaymentInfo.settleDomainName}
</if> </if>
<if test="tPaymentInfo.settleDomainCode != null and tPaymentInfo.settleDomainCode.trim() != ''">
AND a.SETTLE_DOMAIN_CODE = #{tPaymentInfo.settleDomainCode}
</if>
<if test="tPaymentInfo.unitName != null and tPaymentInfo.unitName.trim() != ''"> <if test="tPaymentInfo.unitName != null and tPaymentInfo.unitName.trim() != ''">
AND a.UNIT_NAME = #{tPaymentInfo.unitName} AND a.UNIT_NAME = #{tPaymentInfo.unitName}
</if> </if>
......
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