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

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -1216,6 +1216,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
 							.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince())
 							.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity())
+							.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_INT) //兼容历史数据的调整
 							.in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus)
 					);
 					if (CollectionUtils.isNotEmpty(socialist)) {
@@ -2027,6 +2028,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							fundlist = providentFundMapper.selectList(Wrappers.<TProvidentFund>query().lambda()
 									.eq(TProvidentFund::getEmpIdcard, infoVo.getEmpIdcard())
 									.eq(TProvidentFund::getFundProvince, infoVo.getFundProvince())
+									.eq(TProvidentFund::getDeleteFlag,CommonConstants.ZERO_INT) //添加删除状态兼容历史数据
 									.eq(TProvidentFund::getFundCity, infoVo.getFundCity()));
 							if (CollectionUtils.isNotEmpty(fundlist)) {
 								for (TProvidentFund providentFund : fundlist) {
@@ -2881,6 +2883,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
 							.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince().toString())
 							.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity().toString())
+							.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_INT) //兼容历史数据的调整
 							.in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus)
 					);
 					if (CollectionUtils.isNotEmpty(socialist)) {
@@ -3353,6 +3356,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
 							.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince().toString())
 							.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity().toString())
+							.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_INT) //兼容历史数据的调整
 							.in(TSocialInfo::getHandleStatus, CommonConstants.socialInfoStatus));
 					if (CollectionUtils.isNotEmpty(socialist)) {
 						for (TSocialInfo socialInfo1 : socialist) {