qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

钱智 建模带出固定值

This commit is contained in:
Harryxzy 2025-03-05 09:35:48 +08:00
parent 35db0c3ea8
commit 3339178ac5
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/engine/salary/entity/siarchives/dto/QzSocialInfoDTO.java
View File

@ -33,4 +33,12 @@ public class QzSocialInfoDTO {
// 公司比例 // 公司比例
private BigDecimal comPaymentProportion; private BigDecimal comPaymentProportion;
// 个人固定
private BigDecimal paymentFixed;
// 公司固定
private BigDecimal comPaymentFixed;
} }

9
src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
View File

@ -4258,12 +4258,19 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
Map<String, Object> socialJson = JSON.parseObject(socialArchive.getSocialPaymentBaseString(), new TypeReference<Map<String, Object>>() {}); Map<String, Object> socialJson = JSON.parseObject(socialArchive.getSocialPaymentBaseString(), new TypeReference<Map<String, Object>>() {});
insuranceSchemeDetailMap.forEach((insuranceId, detailList) -> { insuranceSchemeDetailMap.forEach((insuranceId, detailList) -> {
Map<Integer, String> paymentProportionMap = SalaryEntityUtil.convert2Map(detailList, detail -> detail.getPaymentScope(), detail -> detail.getPaymentProportion()); Map<Integer, String> paymentProportionMap = SalaryEntityUtil.convert2Map(detailList, detail -> detail.getPaymentScope(), detail -> detail.getPaymentProportion());
Map<Integer, String> paymentFixedCostMap = SalaryEntityUtil.convert2Map(detailList, detail -> detail.getPaymentScope(), detail -> detail.getFixedCost());
// 个人缴纳比例 // 个人缴纳比例
String paymentProportionStr = paymentProportionMap.get(PaymentScopeEnum.SCOPE_PERSON.getValue()); String paymentProportionStr = paymentProportionMap.get(PaymentScopeEnum.SCOPE_PERSON.getValue());
BigDecimal paymentProportion = NumberUtils.isCreatable(paymentProportionStr) ? new BigDecimal(paymentProportionStr) : null; BigDecimal paymentProportion = NumberUtils.isCreatable(paymentProportionStr) ? new BigDecimal(paymentProportionStr) : null;
// 公司缴纳比例 // 公司缴纳比例
String paymentProportionComStr = paymentProportionMap.get(PaymentScopeEnum.SCOPE_COMPANY.getValue()); String paymentProportionComStr = paymentProportionMap.get(PaymentScopeEnum.SCOPE_COMPANY.getValue());
BigDecimal paymentProportionCom = NumberUtils.isCreatable(paymentProportionComStr) ? new BigDecimal(paymentProportionComStr) : null; BigDecimal paymentProportionCom = NumberUtils.isCreatable(paymentProportionComStr) ? new BigDecimal(paymentProportionComStr) : null;
// 个人固定
String paymentFixedStr = paymentFixedCostMap.get(PaymentScopeEnum.SCOPE_PERSON.getValue());
BigDecimal paymentFixed = NumberUtils.isCreatable(paymentFixedStr) ? new BigDecimal(paymentFixedStr) : null;
// 公司固定
String paymentFixedComStr = paymentFixedCostMap.get(PaymentScopeEnum.SCOPE_COMPANY.getValue());
BigDecimal paymentFixedCom = NumberUtils.isCreatable(paymentFixedComStr) ? new BigDecimal(paymentFixedComStr) : null;
// 缴纳基数 // 缴纳基数
String paymentBaseStr = socialJson.get(insuranceId.toString()) == null ? "" : socialJson.get(insuranceId.toString()).toString(); String paymentBaseStr = socialJson.get(insuranceId.toString()) == null ? "" : socialJson.get(insuranceId.toString()).toString();
BigDecimal paymentBase = NumberUtils.isCreatable(paymentBaseStr) ? new BigDecimal(paymentBaseStr) : null; BigDecimal paymentBase = NumberUtils.isCreatable(paymentBaseStr) ? new BigDecimal(paymentBaseStr) : null;
@ -4273,6 +4280,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
.paymentBase(paymentBase) .paymentBase(paymentBase)
.paymentProportion(paymentProportion) .paymentProportion(paymentProportion)
.comPaymentProportion(paymentProportionCom) .comPaymentProportion(paymentProportionCom)
.paymentFixed(paymentFixed)
.comPaymentFixed(paymentFixedCom)
.build()); .build());
}); });
} }