From 53edb16da9103f717a3beb28de8de1ebcb00157b Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 12 三月 2026 15:40:01 +0800
Subject: [PATCH] fix(staff): 修复员工状态更新时未同步删除标志的问题
---
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 068bcfb..7d59c26 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
@@ -173,13 +173,13 @@
}
Long staffId = id.longValue();
// 绀句繚閲戦
- BigDecimal schemeAmount = new BigDecimal("0.00");
+ BigDecimal socialPersonal = new BigDecimal("0.00");
// 鍏Н閲戦噾棰�
- BigDecimal gjj = new BigDecimal("0.00");
+ BigDecimal fundPersonal = new BigDecimal("0.00");
// 鍩烘湰宸ヨ祫
BigDecimal basicSalary = new BigDecimal("0.00");
- map.put("gjj", gjj); // 鍏Н閲�
- map.put("schemeAmount", schemeAmount); // 绀句繚閲戦
+ map.put("fundPersonal", fundPersonal); // 鍏Н閲�
+ map.put("socialPersonal", socialPersonal); // 绀句繚閲戦
map.put("basicSalary", basicSalary); // 鍩烘湰宸ヨ祫
// 涓◣閲戦
BigDecimal salaryTax = new BigDecimal("0.00");
@@ -215,7 +215,7 @@
// 搴斿彂宸ヨ祫
map.put("grossSalary", basicSalary);
// 涓◣閲戦锛堟棤绀句繚鐗堬級
- BigDecimal bigDecimal = TaxCalculator.calculateMonthlyTax(basicSalary, schemeAmount, gjj);
+ BigDecimal bigDecimal = TaxCalculator.calculateMonthlyTax(basicSalary, socialPersonal, fundPersonal);
map.put("salaryTax", bigDecimal);
// 璁℃椂宸ヨ祫 璁′欢宸ヨ祫
UserProductionAccountingDto userProductionAccountingDto = new UserProductionAccountingDto();
@@ -244,22 +244,22 @@
continue;
}
for (SchemeInsuranceDetail detail : detailList) {
- if("浣忔埧鍏Н閲�".equals(detail.getInsuranceType())){
- gjj = gjj.add(calculateByEmployeeIdType(detail.getInsuranceType(),gjj, staffOnJobDto, detail));
+ if("鍏Н閲�".equals(detail.getInsuranceType())){
+ fundPersonal = fundPersonal.add(calculateByEmployeeIdType(detail.getInsuranceType(),fundPersonal, staffOnJobDto, detail));
}else{
- schemeAmount = schemeAmount.add(calculateByEmployeeIdType(detail.getInsuranceType(),schemeAmount, staffOnJobDto, detail));
+ socialPersonal = socialPersonal.add(calculateByEmployeeIdType(detail.getInsuranceType(),socialPersonal, staffOnJobDto, detail));
}
}
}
- map.put("schemeAmount", schemeAmount);
- map.put("gjj", gjj);
+ map.put("socialPersonal", socialPersonal);
+ map.put("fundPersonal", fundPersonal);
// 涓◣閲戦锛堢ぞ淇濈増锛�
- bigDecimal = TaxCalculator.calculateMonthlyTax(basicSalary, schemeAmount, gjj);
+ bigDecimal = TaxCalculator.calculateMonthlyTax(basicSalary, socialPersonal, fundPersonal);
map.put("salaryTax", bigDecimal);
// 搴旀墸宸ヨ祫
- map.put("deductSalary", bigDecimal.add(gjj).add(schemeAmount));
+ map.put("deductSalary", bigDecimal.add(fundPersonal).add(socialPersonal));
// 瀹炲彂宸ヨ祫
- map.put("netSalary", basicSalary.subtract(bigDecimal).subtract(gjj).subtract(schemeAmount));
+ map.put("netSalary", basicSalary.subtract(bigDecimal).subtract(fundPersonal).subtract(socialPersonal));
}
--
Gitblit v1.9.3