实缴修改

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

@@ -3439,6 +3439,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						} else {
 							if (Common.isNotNull(pensionMoneyMap.get(exitMoneyPer))) {
 								payExists.setPersonalPensionMoney(pensionMoneyMap.get(exitMoneyPer));
+							} else {
+								payExists.setPersonalPensionMoney(BigDecimal.ZERO);
 							}
 							payExists.setUnitPensionMoney(infoVo.getPaymentMoney());
 							pensionMoneyMap.put(exitMoneyCon, BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney()));
@@ -3452,6 +3454,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						} else {
 							if (Common.isNotNull(pensionMoneyMap.get(exitMoneyCon))) {
 								payExists.setUnitPensionMoney(pensionMoneyMap.get(exitMoneyCon));
+							} else {
+								payExists.setUnitPensionMoney(BigDecimal.ZERO);
 							}
 							payExists.setPersonalPensionMoney(infoVo.getPaymentMoney());
 							pensionMoneyMap.put(exitMoneyPer, BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney()));
@@ -3499,6 +3503,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						} else {
 							if (Common.isNotNull(unEmpMoneyMap.get(exitMoneyPer))) {
 								payExists.setPersonalUnemploymentMoney(unEmpMoneyMap.get(exitMoneyPer));
+							} else {
+								payExists.setPersonalUnemploymentMoney(BigDecimal.ZERO);
 							}
 							payExists.setUnitUnemploymentMoney(infoVo.getPaymentMoney());
 							unEmpMoneyMap.put(exitMoneyCon, BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney()));
@@ -3512,6 +3518,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						} else {
 							if (Common.isNotNull(unEmpMoneyMap.get(exitMoneyCon))) {
 								payExists.setUnitUnemploymentMoney(unEmpMoneyMap.get(exitMoneyCon));
+							} else {
+								payExists.setUnitUnemploymentMoney(BigDecimal.ZERO);
 							}
 							payExists.setPersonalUnemploymentMoney(infoVo.getPaymentMoney());
 							unEmpMoneyMap.put(exitMoneyPer, BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney()));
@@ -3559,6 +3567,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						} else {
 							if (Common.isNotNull(medicalMoneyMap.get(exitMoneyPer))) {
 								payExists.setPersonalMedicalMoney(medicalMoneyMap.get(exitMoneyPer));
+							} else {
+								payExists.setPersonalMedicalMoney(BigDecimal.ZERO);
 							}
 							payExists.setUnitMedicalMoney(infoVo.getPaymentMoney());
 							medicalMoneyMap.put(exitMoneyCon, BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney()));
@@ -3572,6 +3582,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						} else {
 							if (Common.isNotNull(medicalMoneyMap.get(exitMoneyCon))) {
 								payExists.setUnitMedicalMoney(medicalMoneyMap.get(exitMoneyCon));
+							} else {
+								payExists.setUnitMedicalMoney(BigDecimal.ZERO);
 							}
 							payExists.setPersonalMedicalMoney(infoVo.getPaymentMoney());
 							medicalMoneyMap.put(exitMoneyPer, BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney()));
@@ -3658,6 +3670,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						} else {
 							if (Common.isNotNull(bigMoneyMap.get(exitMoneyPer))) {
 								payExists.setPersonalBigmailmentMoney(bigMoneyMap.get(exitMoneyPer));
+							} else {
+								payExists.setPersonalBigmailmentMoney(BigDecimal.ZERO);
 							}
 							payExists.setUnitBigmailmentMoney(infoVo.getPaymentMoney());
 							bigMoneyMap.put(exitMoneyCon, BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney()));
@@ -3671,6 +3685,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						} else {
 							if (Common.isNotNull(bigMoneyMap.get(exitMoneyCon))) {
 								payExists.setUnitBigmailmentMoney(bigMoneyMap.get(exitMoneyCon));
+							} else {
+								payExists.setUnitBigmailmentMoney(BigDecimal.ZERO);
 							}
 							payExists.setPersonalBigmailmentMoney(infoVo.getPaymentMoney());
 							bigMoneyMap.put(exitMoneyPer, BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney()));
@@ -3742,8 +3758,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					}
 					batchBirthInsertList.put(exitInsertPaymnet, payExists);
 				}
-				errorMessageList.put(UUID.randomUUID().toString(),new ErrorMessage(infoVo.getRowIndex(),
-						CommonConstants.SAVE_SUCCESS,infoVo));
 			}
 		}
 		return errorMessageList;