From 635a30e95a2b7b51685159ad90310f63023b3f3d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 17 六月 2026 18:03:30 +0800
Subject: [PATCH] 社保按照最新一条数据
---
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
index bf886a2..6348684 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
@@ -172,6 +172,7 @@
boolean hasHourlySalaryInput = hasValue(map, "hourlySalary");
boolean hasSocialPersonalInput = hasValue(map, "socialPersonal");
boolean hasFundPersonalInput = hasValue(map, "fundPersonal");
+ boolean hasSocialSupplementAmountInput = hasValue(map, "socialSupplementAmount");
BigDecimal basicSalary = getBigDecimal(map, "basicSalary");
BigDecimal dayDays = getBigDecimal(map, "dayDays");
@@ -182,6 +183,7 @@
BigDecimal otherDeduct = getBigDecimal(map, "otherDeduct");
BigDecimal socialPersonalInput = getBigDecimal(map, "socialPersonal");
BigDecimal fundPersonalInput = getBigDecimal(map, "fundPersonal");
+ BigDecimal socialSupplementAmountInput = getBigDecimal(map, "socialSupplementAmount");
BigDecimal socialPersonal = BigDecimal.ZERO;
BigDecimal fundPersonal = BigDecimal.ZERO;
BigDecimal salaryTax = BigDecimal.ZERO;
@@ -348,6 +350,9 @@
currentDetailList,
currentMonthSocialPersonal
);
+ if (hasSocialSupplementAmountInput) {
+ socialSupplementAmount = defaultIfNull(socialSupplementAmountInput);
+ }
BigDecimal totalSocialPersonal = currentMonthSocialPersonal.add(socialSupplementAmount);
map.put("socialSupplementAmount", socialSupplementAmount);
// 涓◣閲戦锛堢ぞ淇濈増锛�
@@ -445,7 +450,7 @@
return scheme;
}
}
- return schemeList.get(schemeList.size() - 1);
+ return schemeList.get(0);
}
/**
--
Gitblit v1.9.3