From b1a4d770208b7bc9097469e71d5445bd96c9f647 Mon Sep 17 00:00:00 2001 From: Harry-xzy <822365880@qq.com> Date: Mon, 1 Sep 2025 17:19:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=BB=B4=E5=85=89=E7=94=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SIAccountServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 37f93be40..c7b6e1bd8 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -7337,15 +7337,15 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List childrenGroup = new ArrayList<>(); if (categoryOnlyComIds.contains(categoryId)) { childrenGroup.add(new WeaTableColumnGroup("150", "基数", categoryId + "_base")); - childrenGroup.add(new WeaTableColumnGroup("150", "比例", categoryId + "_comProp")); + childrenGroup.add(new WeaTableColumnGroup("150", "比例(%)", categoryId + "_comProp")); childrenGroup.add(new WeaTableColumnGroup("150", "金额", categoryId + "_com")); } else { List perChildrenGroup = new ArrayList<>(); - perChildrenGroup.add(new WeaTableColumnGroup("150", "比例", categoryId + "_perProp")); + perChildrenGroup.add(new WeaTableColumnGroup("150", "比例(%)", categoryId + "_perProp")); perChildrenGroup.add(new WeaTableColumnGroup("150", "金额", categoryId + "_per")); List comChildrenGroup = new ArrayList<>(); - comChildrenGroup.add(new WeaTableColumnGroup("150", "比例", categoryId + "_comProp")); + comChildrenGroup.add(new WeaTableColumnGroup("150", "比例(%)", categoryId + "_comProp")); comChildrenGroup.add(new WeaTableColumnGroup("150", "金额", categoryId + "_com")); childrenGroup.add(new WeaTableColumnGroup("150", "基数", categoryId + "_base")); @@ -7464,7 +7464,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { singleMap.put("username", employee.getUsername()); singleMap.put("taxAgentName", taxAgentMap.getOrDefault(detailPO.getPaymentOrganization(), "")); singleMap.put("departmentName", detailPO.getDepartmentName()); - singleMap.put("idNo", detailPO.getDepartmentName()); + // singleMap.put("idNo", detailPO.getDepartmentName()); if (schemeForm != null) { List schemeDetailList = schemeForm.getSchemeDetailList(); // 过滤未开启缴纳的 @@ -7528,7 +7528,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { // Map iCategoryMap = SalaryEntityUtil.convert2Map(iCategoryPOS, po -> Utils.null2String(po.getId()), ICategoryPO::getInsuranceName); for (String categoryId : categoryIds) { columns.add(new WeaTableColumnGroup("150", "公积金缴纳基数", categoryId + "_base")); - columns.add(new WeaTableColumnGroup("150", "缴费比例", categoryId + "_comProp")); + columns.add(new WeaTableColumnGroup("150", "缴费比例(%)", categoryId + "_comProp")); columns.add(new WeaTableColumnGroup("150", "个人缴存额", categoryId + "_per")); columns.add(new WeaTableColumnGroup("150", "单位缴存额", categoryId + "_com")); // if (categoryOnlyComIds.contains(categoryId)) {