实缴修改

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

@@ -699,7 +699,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	private R<List<ErrorMessage>> judgeAllMessage1(List<ErrorMessage> errorMessageList) {
 		if (!errorMessageList.isEmpty()) {
 			if(errorMessageList.stream().allMatch(e-> CommonConstants.SAVE_SUCCESS.equals(e.getMessage()))) {
-				return R.ok(errorMessageList);
+				return R.ok();
 			} else {
 				return R.failed(errorMessageList);
 			}
@@ -1763,7 +1763,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				/**
 				 * 单次缓存的数据量
 				 */
-				public static final int BATCH_COUNT = CommonConstants.BATCH_COUNT_TAX;
+				public static final int BATCH_COUNT = CommonConstants.BATCH_COUNT;
 				Integer rowNumber;
 				/**
 				 *临时存储
@@ -2453,7 +2453,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						CompletableFuture<ConcurrentHashMap<String, ErrorMessage>> listCompletableFuture = CompletableFuture.supplyAsync(()
 										-> executeImportSocialListTax(list, areaMap, areaMap2,
 										paymentInfoPensionMap, paymentInfoMedicalMap, paymentInfoUnEmpMap, paymentInfoInjuryMap,
-										paymentInfoBigMap, errorMessageList, pensionMoneyMap, birthMoneyMap,bigMoneyMap,
+										paymentInfoBigMap,paymentInfoBirthMap, errorMessageList, pensionMoneyMap, birthMoneyMap,bigMoneyMap,
 										unEmpMoneyMap, injuryMoneyMap, medicalMoneyMap,	batchGsInsertList,
 										batchSyInsertList, batchYlInsertList, batchYyInsertList, batchBigInsertList, batchBirthInsertList,domainMap),
 								yfSocialImportThreadPoolExecutor);
@@ -2466,7 +2466,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							CompletableFuture<ConcurrentHashMap<String, ErrorMessage>> listCompletableFuture = CompletableFuture.supplyAsync(()
 											-> executeImportSocialListTax(finalTempList1
 											, areaMap, areaMap2, paymentInfoPensionMap, paymentInfoMedicalMap,
-											paymentInfoUnEmpMap, paymentInfoInjuryMap, paymentInfoBigMap,
+											paymentInfoUnEmpMap, paymentInfoInjuryMap, paymentInfoBigMap,paymentInfoBirthMap,
 											errorMessageList, pensionMoneyMap, birthMoneyMap, bigMoneyMap, unEmpMoneyMap,
 											injuryMoneyMap, medicalMoneyMap, batchGsInsertList, batchSyInsertList,
 											batchYlInsertList, batchYyInsertList, batchBigInsertList, batchBirthInsertList, domainMap),
@@ -3223,7 +3223,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 																				  ConcurrentHashMap<String, TPaymentInfo> paymentInfoUnEmpMap,
 																				  ConcurrentHashMap<String, TPaymentInfo> paymentInfoInjuryMap,
 																				  ConcurrentHashMap<String, TPaymentInfo> paymentInfoBigMap,
-																				  ConcurrentHashMap<String, ErrorMessage> errorMessageList,
+																			      ConcurrentHashMap<String, TPaymentInfo> paymentInfoBirthMap,
+																			      ConcurrentHashMap<String, ErrorMessage> errorMessageList,
 																				  ConcurrentHashMap<String, BigDecimal> pensionMoneyMap,
 																				  ConcurrentHashMap<String, BigDecimal> birthMoneyMap,
 																				  ConcurrentHashMap<String, BigDecimal> bigMoneyMap,
@@ -3457,8 +3458,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						}
 					}
 					payExists.setUnitPensionSet(infoVo.getPaymentSet());
-					payExists.setUnitSocialSum(payExists.getUnitPensionMoney());
-					payExists.setSocialSecurityPersonalSum(payExists.getPersonalPensionMoney());
+					payExists.setUnitSocialSum(Common.isEmpty(payExists.getUnitPensionMoney()) ? BigDecimal.ZERO : payExists.getUnitPensionMoney());
+					payExists.setSocialSecurityPersonalSum(Common.isEmpty(payExists.getPersonalPensionMoney()) ? BigDecimal.ZERO : payExists.getPersonalPensionMoney());
 					payExists.setSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitSocialSum(), payExists.getSocialSecurityPersonalSum()));
 					payExists.setSumAll(payExists.getSocialSum());
 
@@ -3517,8 +3518,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						}
 					}
 					payExists.setUnitUnemploymentSet(infoVo.getPaymentSet());
-					payExists.setUnitSocialSum(payExists.getUnitUnemploymentMoney());
-					payExists.setSocialSecurityPersonalSum(payExists.getPersonalUnemploymentMoney());
+					payExists.setUnitSocialSum(Common.isEmpty(payExists.getUnitUnemploymentMoney()) ? BigDecimal.ZERO : payExists.getUnitUnemploymentMoney());
+					payExists.setSocialSecurityPersonalSum(Common.isEmpty(payExists.getPersonalUnemploymentMoney()) ? BigDecimal.ZERO : payExists.getPersonalUnemploymentMoney());
 					payExists.setSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitSocialSum(), payExists.getPersonalUnemploymentMoney()));
 					payExists.setSumAll(payExists.getSocialSum());
 
@@ -3577,8 +3578,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						}
 					}
 					payExists.setUnitMedicalSet(infoVo.getPaymentSet());
-					payExists.setUnitSocialSum(payExists.getUnitMedicalMoney());
-					payExists.setSocialSecurityPersonalSum(payExists.getPersonalMedicalMoney());
+					payExists.setUnitSocialSum(Common.isEmpty(payExists.getUnitMedicalMoney()) ? BigDecimal.ZERO : payExists.getUnitMedicalMoney());
+					payExists.setSocialSecurityPersonalSum(Common.isEmpty(payExists.getPersonalMedicalMoney()) ? BigDecimal.ZERO : payExists.getPersonalMedicalMoney());
 					payExists.setSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitSocialSum(), payExists.getSocialSecurityPersonalSum()));
 					payExists.setSumAll(payExists.getSocialSum());
 
@@ -3594,8 +3595,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					//存在社保缴费数据
 					if (null != payInsert && ((null != payInsert.getYlSameFlg() && CommonConstants.ONE_STRING.equals(payInsert.getYlSameFlg()))
 							|| (BigDecimalUtils.safeMultiply(payExists.getSocialSum(), BigDecimalUtils.safeAdd(
-							BigDecimalUtils.isNullToZero(payInsert.getUnitPensionMoney()),
-							BigDecimalUtils.isNullToZero(payInsert.getPersonalPensionMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
+							BigDecimalUtils.isNullToZero(payInsert.getUnitMedicalMoney()),
+							BigDecimalUtils.isNullToZero(payInsert.getPersonalMedicalMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
 						errorMessageList.put(UUID.randomUUID().toString(),new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的医疗缴费数据,请勿重复导入！",infoVo));
 						continue;
@@ -3618,7 +3619,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						injuryMoneyMap.put(exitMoneyCon, BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney()));
 					}
 					payExists.setUnitInjurySet(infoVo.getPaymentSet());
-					payExists.setUnitSocialSum(payExists.getUnitInjuryMoney());
+					payExists.setUnitSocialSum(Common.isEmpty(payExists.getUnitInjuryMoney()) ? BigDecimal.ZERO : payExists.getUnitInjuryMoney());
 					payExists.setSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitSocialSum()));
 					payExists.setSumAll(payExists.getSocialSum());
 
@@ -3675,8 +3676,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							bigMoneyMap.put(exitMoneyPer, BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney()));
 						}
 					}
-					payExists.setUnitSocialSum(payExists.getUnitBigmailmentMoney());
-					payExists.setSocialSecurityPersonalSum(payExists.getPersonalBigmailmentMoney());
+					payExists.setUnitSocialSum(Common.isEmpty(payExists.getUnitBigmailmentMoney()) ? BigDecimal.ZERO : payExists.getUnitBigmailmentMoney());
+					payExists.setSocialSecurityPersonalSum(Common.isEmpty(payExists.getPersonalBigmailmentMoney()) ? BigDecimal.ZERO : payExists.getPersonalBigmailmentMoney());
 					payExists.setSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitSocialSum(), payExists.getSocialSecurityPersonalSum()));
 					payExists.setSumAll(payExists.getSocialSum());
 
@@ -3717,11 +3718,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						birthMoneyMap.put(exitMoneyCon, BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney()));
 					}
 					payExists.setUnitBirthSet(infoVo.getPaymentSet());
+					payExists.setUnitSocialSum(Common.isEmpty(payExists.getUnitBirthMoney()) ? BigDecimal.ZERO : payExists.getUnitBirthMoney());
 					payExists.setUnitSocialSum(payExists.getUnitBirthMoney());
 					payExists.setSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitSocialSum()));
 					payExists.setSumAll(payExists.getSocialSum());
 
-					payInsert = paymentInfoInjuryMap.get(infoVo.getSocialPayAddr()
+					payInsert = paymentInfoBirthMap.get(infoVo.getSocialPayAddr()
 							+ CommonConstants.DOWN_LINE_STRING
 							+ infoVo.getEmpIdcard().trim()
 							+ CommonConstants.DOWN_LINE_STRING