Skip to content

Y
yifu-mvp
Commit ae51bea7 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

实缴库导入删除状态兼容老数据-fxj

parent 5e3d6c0d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ ae51bea7
...@@ -1216,6 +1216,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1216,6 +1216,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard()) .eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince()) .eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince())
.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity()) .eq(TSocialInfo::getSocialCity, infoVo.getSocialCity())
.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_INT) //兼容历史数据的调整
.in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus) .in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus)
); );
if (CollectionUtils.isNotEmpty(socialist)) { if (CollectionUtils.isNotEmpty(socialist)) {
...@@ -2027,6 +2028,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2027,6 +2028,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
fundlist = providentFundMapper.selectList(Wrappers.<TProvidentFund>query().lambda() fundlist = providentFundMapper.selectList(Wrappers.<TProvidentFund>query().lambda()
.eq(TProvidentFund::getEmpIdcard, infoVo.getEmpIdcard()) .eq(TProvidentFund::getEmpIdcard, infoVo.getEmpIdcard())
.eq(TProvidentFund::getFundProvince, infoVo.getFundProvince()) .eq(TProvidentFund::getFundProvince, infoVo.getFundProvince())
.eq(TProvidentFund::getDeleteFlag,CommonConstants.ZERO_INT) //添加删除状态兼容历史数据
.eq(TProvidentFund::getFundCity, infoVo.getFundCity())); .eq(TProvidentFund::getFundCity, infoVo.getFundCity()));
if (CollectionUtils.isNotEmpty(fundlist)) { if (CollectionUtils.isNotEmpty(fundlist)) {
for (TProvidentFund providentFund : fundlist) { for (TProvidentFund providentFund : fundlist) {
...@@ -2881,6 +2883,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2881,6 +2883,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard()) .eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince().toString()) .eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince().toString())
.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity().toString()) .eq(TSocialInfo::getSocialCity, infoVo.getSocialCity().toString())
.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_INT) //兼容历史数据的调整
.in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus) .in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus)
); );
if (CollectionUtils.isNotEmpty(socialist)) { if (CollectionUtils.isNotEmpty(socialist)) {
...@@ -3353,6 +3356,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -3353,6 +3356,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard()) .eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince().toString()) .eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince().toString())
.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity().toString()) .eq(TSocialInfo::getSocialCity, infoVo.getSocialCity().toString())
.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_INT) //兼容历史数据的调整
.in(TSocialInfo::getHandleStatus, CommonConstants.socialInfoStatus)); .in(TSocialInfo::getHandleStatus, CommonConstants.socialInfoStatus));
if (CollectionUtils.isNotEmpty(socialist)) { if (CollectionUtils.isNotEmpty(socialist)) {
for (TSocialInfo socialInfo1 : socialist) { for (TSocialInfo socialInfo1 : socialist) {
......
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