Skip to content

Y
yifu-mvp
Commit f84f404e authored by huyuchen's avatar huyuchen
Browse files
Options

Merge remote-tracking branch 'origin/develop'

parents 1fa4fd18 230d9e81
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 24 deletions
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentTaxSocialVo.java
View file @ f84f404e
......@@ -86,7 +86,7 @@ public class TPaymentTaxSocialVo extends RowIndex implements Serializable {
private BigDecimal paymentMoney;
/**
* 人员编号
* 人员编号（不导入）
*/
@ExcelAttribute(name = "人员编号")
@Schema(description = "人员编号")
......@@ -97,7 +97,7 @@ public class TPaymentTaxSocialVo extends RowIndex implements Serializable {
/**
* 险种
*/
@ExcelAttribute(name = "险种", isNotEmpty = true, errorInfo = "险种不可为空", maxLength = 10)
@ExcelAttribute(name = "险种", isNotEmpty = true, errorInfo = "险种不可为空", maxLength = 20)
@Schema(description = "险种")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "险种")
......@@ -164,6 +164,8 @@ public class TPaymentTaxSocialVo extends RowIndex implements Serializable {
@Length(max = 32, message = "社保户不能超过32个字符")
@ExcelAttribute(name = "社保户", maxLength = 32)
@Schema(description = "社保户")
@ExcelProperty(value = "社保户")
@HeadFontStyle(fontHeightInPoints = 11)
private String socialHousehold;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ f84f404e
......@@ -83,6 +83,7 @@ import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* 缴费库
......@@ -698,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);
}
......@@ -1762,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;
/**
*临时存储
......@@ -2452,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);
......@@ -2465,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),
......@@ -3222,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,
......@@ -3456,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());
......@@ -3516,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());
......@@ -3548,7 +3550,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitMoneyPer = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.PENSION_MEDICAL));
exitMoneyCon = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.COMPANY_MEDICAL));
exitInsertPaymnet = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.MEDICAL));
if (PaymentConstants.COMPANY_UNEMPLOYEEMENT.equals(infoVo.getRiskType())) {
if (PaymentConstants.COMPANY_MEDICAL.equals(infoVo.getRiskType())) {
if (medicalMoneyMap.get(exitMoneyCon) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, medicalMoneyMap.get(exitMoneyCon)).compareTo(BigDecimal.ZERO) > 0) {
......@@ -3576,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());
......@@ -3593,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;
......@@ -3603,9 +3605,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
//判断是否存在工伤缴费数据
if (PaymentConstants.COMPANY_INJURY_RISK.equals(infoVo.getRiskType())) {
if (PaymentConstants.INJURY_RISK.equals(infoVo.getRiskType())) {
//导入模板判重工伤
exitMoneyCon = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.COMPANY_INJURY_RISK));
exitMoneyCon = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.INJURY_RISK));
exitInsertPaymnet = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.INJURY_RISK));
if (injuryMoneyMap.get(exitMoneyCon) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
......@@ -3617,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());
......@@ -3647,8 +3649,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitMoneyPer = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.PENSION_BIG));
exitMoneyCon = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.COMPANY_BIG));
exitInsertPaymnet = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.BIG));
if (PaymentConstants.COMPANY_UNEMPLOYEEMENT.equals(infoVo.getRiskType())) {
exitMoneyCon = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.COMPANY_YL));
if (PaymentConstants.COMPANY_BIG.equals(infoVo.getRiskType())) {
if (bigMoneyMap.get(exitMoneyCon) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, bigMoneyMap.get(exitMoneyCon)).compareTo(BigDecimal.ZERO) > 0) {
......@@ -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
......@@ -3791,6 +3793,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
errorMessageList.put(UUID.randomUUID().toString(),new ErrorMessage(infoVo.getRowIndex(), "社保缴纳地不可为空！",infoVo));
return true;
}
List<String> riskList = Stream.of("职工基本养老保险(单位缴纳)","职工基本养老保险(个人缴纳)","失业保险(单位缴纳)","失业保险(个人缴纳)"
,"职工基本医疗保险(个人缴纳)","职工基本医疗保险(单位缴纳)","工伤保险","单位大病救助金","个人大病救助金","单位生育").collect(Collectors.toList());
if (Common.isNotNull(infoVo.getRiskType()) && riskList.stream().noneMatch(e -> e.equals(infoVo.getRiskType()))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorMessage(infoVo.getRowIndex(), "险种填写不正确！",infoVo));
return true;
}
return false;
}
......
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