Skip to content

Y
yifu-mvp
Commit d55e29e5 authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.6.5' into MVP1.6.5

parents 82c98e4b 292def39
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 23 deletions
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentTaxSocialVo.java
View file @ d55e29e5
......@@ -52,10 +52,10 @@ public class TPaymentTaxSocialVo extends RowIndex implements Serializable {
/**
* 缴费工资
*/
@ExcelAttribute(name = "缴费工资（不导入）", isFloat = true,max = "999999999.99", min= -999999999)
@Schema(description = "缴费工资（不导入）")
@ExcelAttribute(name = "缴费工资", isFloat = true,max = "999999999.99", min= -999999999)
@Schema(description = "缴费工资")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴费工资（不导入）", converter = BigDecimalConverter.class)
@ExcelProperty(value = "缴费工资", converter = BigDecimalConverter.class)
private BigDecimal paymentSalary;
/**
......@@ -70,10 +70,10 @@ public class TPaymentTaxSocialVo extends RowIndex implements Serializable {
/**
* 费率
*/
@ExcelAttribute(name = "费率（不导入）")
@Schema(description = "费率（不导入）")
@ExcelAttribute(name = "费率")
@Schema(description = "费率")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "费率（不导入）")
@ExcelProperty(value = "费率")
private String paymentPer;
/**
......@@ -88,16 +88,16 @@ public class TPaymentTaxSocialVo extends RowIndex implements Serializable {
/**
* 人员编号（不导入）
*/
@ExcelAttribute(name = "人员编号（不导入）")
@Schema(description = "人员编号（不导入）")
@ExcelAttribute(name = "人员编号")
@Schema(description = "人员编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "人员编号（不导入）")
@ExcelProperty(value = "人员编号")
private String empNo;
/**
* 险种
*/
@ExcelAttribute(name = "险种", isNotEmpty = true, errorInfo = "险种不可为空", maxLength = 10)
@ExcelAttribute(name = "险种", isNotEmpty = true, errorInfo = "险种不可为空", maxLength = 20)
@Schema(description = "险种")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "险种")
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/PaymentConstants.java
View file @ d55e29e5
......@@ -16,15 +16,13 @@ public class PaymentConstants {
public static final String EXPORT = "缴费库合并导出";
public static final String SEARCH_EXPORT = "缴费库查询合并导出";
public static final String PAYMENT_SEARCH_EXPORT = "实缴查询批量导出";
public static final String COMPANY_YL = "单位养老";
public static final String PENSION_YL = "个人养老";
public static final String COMPANY_MEDICAL = "单位医疗";
public static final String PENSION_MEDICAL = "个人医疗";
public static final String COMPANY_UNEMPLOYEEMENT = "单位失业";
public static final String PENSION_UNEMPLOYEEMENT = "个人失业";
public static final String COMPANY_INJURY_RISK = "单位工伤";
public static final String COMPANY_YL = "职工基本养老保险(单位缴纳)";
public static final String PENSION_YL = "职工基本养老保险(个人缴纳)";
public static final String COMPANY_MEDICAL = "职工基本医疗保险(单位缴纳)";
public static final String PENSION_MEDICAL = "职工基本医疗保险(个人缴纳)";
public static final String COMPANY_UNEMPLOYEEMENT = "失业保险(单位缴纳)";
public static final String PENSION_UNEMPLOYEEMENT = "失业保险(个人缴纳)";
public static final String COMPANY_BIG = "单位大病救助金";
public static final String PENSION_BIG = "个人大病救助金";
public static final String COMPANY_BIRTH = "单位生育";
public static final String PENSION_BIRTH = "个人生育";
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ d55e29e5
......@@ -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;
/**
* 缴费库
......@@ -3548,7 +3549,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) {
......@@ -3603,9 +3604,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())
......@@ -3647,8 +3648,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) {
......@@ -3791,6 +3791,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