From dcd1aab9b5bec2556161c16bd1bc4fe71fef476d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 17:17:47 +0800
Subject: [PATCH] 关于社保补缴的计算,如果社保保险设置有多条数据,根据创建时间来判断,当月即以后得参考标准用对应的配置,并且需要统计当年从1月到现在缴纳的所有社保金额,和最新的社保比列得出的金额进行比较,计算需要补缴的金额,只有社会保险设置新增一条数据的当月会计算,其余月份对应的都是0
---
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 208 insertions(+), 30 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 e59ca71..f22db90 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
@@ -21,7 +21,12 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -48,6 +53,8 @@
private final PersonalAttendanceLocationConfigMapper personalAttendanceLocationConfigMapper;
private final SalesLedgerProductionAccountingService salesLedgerProductionAccountingService;
private final SubsidyConfigurationMapper subsidyConfigurationMapper;
+ private final StaffSalaryMainMapper staffSalaryMainMapper;
+ private final StaffSalaryDetailMapper staffSalaryDetailMapper;
@Override
@@ -165,6 +172,7 @@
BigDecimal basicSalary = new BigDecimal("0.00");
map.put("fundPersonal", fundPersonal); // 鍏Н閲�
map.put("socialPersonal", socialPersonal); // 绀句繚閲戦
+ map.put("socialSupplementAmount", BigDecimal.ZERO); // 绀句繚琛ョ即閲戦
map.put("basicSalary", basicSalary); // 鍩烘湰宸ヨ祫
// 涓◣閲戦
BigDecimal salaryTax = new BigDecimal("0.00");
@@ -299,23 +307,36 @@
if (CollectionUtils.isEmpty(schemeList)) {
return; // 鏃犲尮閰嶆柟妗堬紝杩斿洖绌哄垪琛�
}
- // 3. 涓烘瘡涓柟妗堝叧鑱旀槑缁嗗垪琛�
- for (SchemeApplicableStaff scheme : schemeList) {
- List<SchemeInsuranceDetail> detailList = schemeApplicableStaffMapper.selectDetailBySchemeId(scheme.getId());
- // 鏍规嵁鏄庣粏鍒楄〃璁＄畻绀句繚缂磋垂閲戦
- if(CollectionUtils.isEmpty(detailList)){
- continue;
+ YearMonth targetMonth = parseTargetMonth(date);
+ SchemeApplicableStaff currentScheme = resolveCurrentScheme(schemeList, targetMonth);
+ if (currentScheme == null) {
+ return;
+ }
+ List<SchemeInsuranceDetail> currentDetailList = defaultIfNull(
+ schemeApplicableStaffMapper.selectDetailBySchemeId(currentScheme.getId())
+ );
+ for (SchemeInsuranceDetail detail : currentDetailList) {
+ BigDecimal amount = calculateInsuranceAmount(staffOnJobDto, detail);
+ if ("鍏Н閲�".equals(detail.getInsuranceType())) {
+ fundPersonal = fundPersonal.add(amount);
+ } else {
+ socialPersonal = socialPersonal.add(amount);
}
- for (SchemeInsuranceDetail detail : detailList) {
- if("鍏Н閲�".equals(detail.getInsuranceType())){
- fundPersonal = fundPersonal.add(calculateByEmployeeIdType(detail.getInsuranceType(),fundPersonal, staffOnJobDto, detail));
- }else{
- socialPersonal = socialPersonal.add(calculateByEmployeeIdType(detail.getInsuranceType(),socialPersonal, staffOnJobDto, detail));
- }
- }
+ }
+ BigDecimal socialSupplementAmount = calculateSocialSupplementAmount(
+ staffId,
+ staffOnJobDto,
+ targetMonth,
+ currentScheme,
+ currentDetailList,
+ socialPersonal
+ );
+ if (socialSupplementAmount.compareTo(BigDecimal.ZERO) > 0) {
+ socialPersonal = socialPersonal.add(socialSupplementAmount);
}
map.put("socialPersonal", socialPersonal);
map.put("fundPersonal", fundPersonal);
+ map.put("socialSupplementAmount", socialSupplementAmount);
// 涓◣閲戦锛堢ぞ淇濈増锛�
bigDecimal = TaxCalculator.calculateMonthlyTax(basicSalary, socialPersonal, fundPersonal);
map.put("salaryTax", bigDecimal);
@@ -351,24 +372,181 @@
}
/**
- * 璁＄畻
- * @param type
- * @param bigDecimal
- * @param staffOnJobDto
- * @param detail
- * @return
+ * 璁＄畻鍗曢」淇濋櫓閲戦
*/
- public BigDecimal calculateByEmployeeIdType(String type,BigDecimal bigDecimal, StaffOnJob staffOnJobDto,SchemeInsuranceDetail detail) {
- // 鍒ゆ柇鏄惁璋冪敤鍩烘湰宸ヨ祫
- if (detail.getUseBasicSalary() == 1) {
- BigDecimal divide = detail.getPaymentBase().multiply(detail.getPersonalRatio()).divide(new BigDecimal("100"), 2);
- bigDecimal = bigDecimal.add(divide);
- }else{
- // 璋冪敤鍩烘湰宸ヨ祫
- BigDecimal multiply = staffOnJobDto.getBasicSalary().multiply(detail.getPersonalRatio().divide(new BigDecimal("100"), 2));
- bigDecimal = bigDecimal.add(multiply);
+ public BigDecimal calculateInsuranceAmount(StaffOnJob staffOnJobDto, SchemeInsuranceDetail detail) {
+ if (staffOnJobDto == null || detail == null) {
+ return BigDecimal.ZERO;
}
- bigDecimal = bigDecimal.add(detail.getPersonalFixed());
- return bigDecimal;
+ BigDecimal ratio = detail.getPersonalRatio() == null ? BigDecimal.ZERO : detail.getPersonalRatio();
+ BigDecimal fixed = detail.getPersonalFixed() == null ? BigDecimal.ZERO : detail.getPersonalFixed();
+ BigDecimal baseAmount;
+ if (detail.getUseBasicSalary() == 1) {
+ baseAmount = detail.getPaymentBase() == null ? BigDecimal.ZERO : detail.getPaymentBase();
+ } else {
+ baseAmount = staffOnJobDto.getBasicSalary() == null ? BigDecimal.ZERO : staffOnJobDto.getBasicSalary();
+ }
+ BigDecimal ratioAmount = baseAmount.multiply(ratio).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
+ return ratioAmount.add(fixed);
+ }
+
+ private SchemeApplicableStaff resolveCurrentScheme(List<SchemeApplicableStaff> schemeList, YearMonth targetMonth) {
+ if (CollectionUtils.isEmpty(schemeList)) {
+ return null;
+ }
+ if (targetMonth == null) {
+ return schemeList.get(0);
+ }
+ for (SchemeApplicableStaff scheme : schemeList) {
+ if (scheme.getCreateTime() == null) {
+ continue;
+ }
+ YearMonth schemeMonth = YearMonth.from(scheme.getCreateTime());
+ if (!schemeMonth.isAfter(targetMonth)) {
+ return scheme;
+ }
+ }
+ return schemeList.get(schemeList.size() - 1);
+ }
+
+ /**
+ * 璁＄畻绀句繚琛ョ即閲戦
+ *
+ * 涓氬姟閫昏緫锛�
+ * 1. 鍙湁鍦ㄧぞ淇濇柟妗堣缃柊澧炵殑褰撴湀鎵嶈绠楄ˉ缂撮噾棰濓紝鍏朵綑鏈堜唤杩斿洖0
+ * 2. 鏍规嵁鏈�鏂扮ぞ淇濇瘮渚嬭绠楀綋鏈堝強浠ュ悗搴旂即绾崇殑閲戦鏍囧噯
+ * 3. 缁熻褰撳勾1鏈堝埌褰撳墠鏈堝凡缂寸撼鐨勭ぞ淇濇�婚
+ * 4. 鐢ㄦ渶鏂版爣鍑嗚绠楃殑鏈熸湜鎬婚涓庡疄闄呭凡缂寸撼閲戦鐨勫樊棰濆嵆涓鸿ˉ缂撮噾棰�
+ *
+ * @param staffId 鍛樺伐ID
+ * @param staffOnJobDto 鍛樺伐鍦ㄨ亴淇℃伅锛堢敤浜庤绠楃ぞ淇濋噾棰濓級
+ * @param targetMonth 鐩爣璁＄畻鏈堜唤
+ * @param currentScheme 褰撳墠绀句繚鏂规
+ * @param currentDetailList 褰撳墠绀句繚鏂规鏄庣粏鍒楄〃
+ * @param currentMonthSocialPersonal 褰撳墠鏈堜釜浜虹ぞ淇濋噾棰�
+ * @return 绀句繚琛ョ即閲戦锛堣礋鏁版垨0杩斿洖0锛�
+ */
+ private BigDecimal calculateSocialSupplementAmount(Long staffId,
+ StaffOnJob staffOnJobDto,
+ YearMonth targetMonth,
+ SchemeApplicableStaff currentScheme,
+ List<SchemeInsuranceDetail> currentDetailList,
+ BigDecimal currentMonthSocialPersonal) {
+ // 1. 鍙傛暟鏍￠獙锛氫换涓�蹇呭～鍙傛暟涓虹┖锛岃繑鍥�0
+ if (staffId == null || staffOnJobDto == null || targetMonth == null || currentScheme == null || currentScheme.getCreateTime() == null) {
+ return BigDecimal.ZERO;
+ }
+
+ // 2. 鍒ゆ柇鏄惁涓虹ぞ淇濇柟妗堟柊澧炲綋鏈�
+ // 鍙湁鏂板绀句繚璁剧疆鐨勫綋鏈堟墠璁＄畻琛ョ即锛屽叾浣欐湀浠借繑鍥�0
+ YearMonth schemeMonth = YearMonth.from(currentScheme.getCreateTime());
+ if (!schemeMonth.equals(targetMonth)) {
+ return BigDecimal.ZERO;
+ }
+
+ // 3. 璁＄畻鏈�鏂版湀搴︾ぞ淇濅釜浜洪噾棰濓紙鎺掗櫎鍏Н閲戯級
+ BigDecimal latestMonthlySocial = defaultIfNull(currentDetailList).stream()
+ .filter(Objects::nonNull)
+ .filter(detail -> !"鍏Н閲�".equals(detail.getInsuranceType())) // 鎺掗櫎鍏Н閲�
+ .map(detail -> calculateInsuranceAmount(staffOnJobDto, detail)) // 璁＄畻姣忛」绀句繚閲戦
+ .reduce(BigDecimal.ZERO, BigDecimal::add); // 绱姞姹傚拰
+
+ // 濡傛灉鏈�鏂版湀搴︾ぞ淇濋噾棰濅负0鎴栬礋鏁帮紝鏃犻渶琛ョ即
+ if (latestMonthlySocial.compareTo(BigDecimal.ZERO) <= 0) {
+ return BigDecimal.ZERO;
+ }
+
+ // 4. 缁熻褰撳勾1鏈堝埌褰撳墠鏈堜箣鍓嶅凡缂寸撼鐨勭ぞ淇濇�婚
+ BigDecimal paidYtdSocial = sumPaidSocialPersonalBeforeMonth(staffId, targetMonth);
+
+ // 5. 璁＄畻鎸夋渶鏂版爣鍑嗗簲缂寸撼鐨勫勾搴︽�婚
+ // 鏈熸湜鎬婚 = 鏈�鏂版湀搴︾ぞ淇� 脳 褰撳墠鏈堜唤锛�1-12锛�
+ BigDecimal expectedYtdSocial = latestMonthlySocial.multiply(BigDecimal.valueOf(targetMonth.getMonthValue()));
+
+ // 6. 璁＄畻琛ョ即閲戦
+ // 琛ョ即閲戦 = 鏈熸湜鎬婚 - 宸茬即绾虫�婚 - 褰撳墠鏈堝凡璁＄畻鐨勭ぞ淇�
+ BigDecimal supplement = expectedYtdSocial.subtract(paidYtdSocial).subtract(defaultZero(currentMonthSocialPersonal));
+
+ // 7. 杩斿洖缁撴灉锛氳礋鏁版垨0杩斿洖0锛屾鏁颁繚鐣欎袱浣嶅皬鏁�
+ return supplement.compareTo(BigDecimal.ZERO) > 0 ? supplement.setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+ }
+
+ /**
+ * 缁熻鍛樺伐褰撳勾1鏈堝埌鐩爣鏈堜唤涔嬪墠宸茬即绾崇殑绀句繚涓汉閮ㄥ垎鎬婚
+ *
+ * 鏌ヨ閫昏緫锛�
+ * 1. 鏍规嵁鐩爣鏈堜唤鑾峰彇褰撳勾骞翠唤鍓嶇紑锛堝 "2024-"锛�
+ * 2. 鏌ヨ璇ュ勾浠戒笅鎵�鏈夋棭浜庣洰鏍囨湀浠界殑钖祫涓昏〃璁板綍
+ * 3. 鏍规嵁钖祫涓昏〃ID鏌ヨ瀵瑰簲鐨勮柂璧勬槑缁嗚〃
+ * 4. 鎸夊憳宸D绛涢�夊苟绱姞绀句繚涓汉閮ㄥ垎閲戦
+ *
+ * @param staffId 鍛樺伐ID
+ * @param targetMonth 鐩爣鏈堜唤锛堢粺璁℃埅姝㈠埌璇ユ湀浠戒箣鍓嶏級
+ * @return 宸茬即绾崇殑绀句繚涓汉閮ㄥ垎鎬婚
+ */
+ private BigDecimal sumPaidSocialPersonalBeforeMonth(Long staffId, YearMonth targetMonth) {
+ // 1. 鍙傛暟鏍￠獙
+ if (staffId == null || targetMonth == null) {
+ return BigDecimal.ZERO;
+ }
+
+ // 2. 鏋勫缓鏌ヨ鏉′欢
+ String yearPrefix = targetMonth.getYear() + "-"; // 骞翠唤鍓嶇紑锛屽 "2024-"
+ String currentMonthStr = targetMonth.format(DateTimeFormatter.ofPattern("yyyy-MM")); // 鐩爣鏈堜唤瀛楃涓诧紝濡� "2024-03"
+
+ // 3. 鏌ヨ褰撳勾1鏈堝埌鐩爣鏈堜唤涔嬪墠鐨勮柂璧勪富琛�
+ List<StaffSalaryMain> salaryMainList = staffSalaryMainMapper.selectList(
+ new LambdaQueryWrapper<StaffSalaryMain>()
+ .likeRight(StaffSalaryMain::getSalaryMonth, yearPrefix) // 鍖归厤褰撳勾鎵�鏈夋湀浠�
+ .lt(StaffSalaryMain::getSalaryMonth, currentMonthStr) // 灏忎簬鐩爣鏈堜唤
+ );
+ if (CollectionUtils.isEmpty(salaryMainList)) {
+ return BigDecimal.ZERO;
+ }
+
+ // 4. 鎻愬彇钖祫涓昏〃ID鍒楄〃
+ List<Long> mainIds = salaryMainList.stream()
+ .map(StaffSalaryMain::getId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(mainIds)) {
+ return BigDecimal.ZERO;
+ }
+
+ // 5. 鏌ヨ瀵瑰簲鐨勮柂璧勬槑缁嗚〃
+ List<StaffSalaryDetail> detailList = staffSalaryDetailMapper.selectList(
+ new LambdaQueryWrapper<StaffSalaryDetail>()
+ .in(StaffSalaryDetail::getMainId, mainIds) // 鏍规嵁涓昏〃ID鏌ヨ
+ .eq(StaffSalaryDetail::getStaffOnJobId, staffId) // 鎸夊憳宸D绛涢��
+ );
+ if (CollectionUtils.isEmpty(detailList)) {
+ return BigDecimal.ZERO;
+ }
+
+ // 6. 绱姞绀句繚涓汉閮ㄥ垎閲戦
+ return detailList.stream()
+ .map(StaffSalaryDetail::getSocialPersonal) // 鑾峰彇绀句繚涓汉閮ㄥ垎
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add); // 绱姞姹傚拰
+ }
+
+ private YearMonth parseTargetMonth(String date) {
+ if (StringUtils.isEmpty(date)) {
+ return null;
+ }
+ String normalized = date.length() >= 7 ? date.substring(0, 7) : date;
+ try {
+ return YearMonth.parse(normalized, DateTimeFormatter.ofPattern("yyyy-MM"));
+ } catch (DateTimeParseException ex) {
+ return null;
+ }
+ }
+
+ private <T> List<T> defaultIfNull(List<T> list) {
+ return list == null ? Collections.emptyList() : list;
+ }
+
+ private BigDecimal defaultZero(BigDecimal value) {
+ return value == null ? BigDecimal.ZERO : value;
}
}
--
Gitblit v1.9.3