diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index e1680e6cb..4fe4309ae 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -7353,6 +7353,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { childrenGroup.add(new WeaTableColumnGroup("150", "单位", "单位", comChildrenGroup)); } String categoryName = Utils.null2String(iCategoryMap.get(categoryId)); + categoryName = categoryName.replace("保险", ""); + if (categoryOnlyComIds.contains(categoryId)) { + categoryName = categoryName + "(单位)"; + } columns.add(new WeaTableColumnGroup("150", categoryName, categoryName, childrenGroup)); } columns.add(new WeaTableColumnGroup("150", "个人承担", "perSum")); @@ -7516,17 +7520,17 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { columns.add(new WeaTableColumnGroup("150", "姓名", "username")); columns.add(new WeaTableColumnGroup("150", "单位", "taxAgentName")); columns.add(new WeaTableColumnGroup("150", "部门", "departmentName")); - columns.add(new WeaTableColumnGroup("150", "身份证号", "idNo")); - List categoryOnlyComIds = Arrays.stream(baseBean.getPropValue("lwgdSalaryReport", "fund_report_only_com_category_ids").split(",")) - .filter(org.apache.commons.lang3.math.NumberUtils::isCreatable).collect(Collectors.toList()); + columns.add(new WeaTableColumnGroup("150", "证件号码", "idNo")); + // List categoryOnlyComIds = Arrays.stream(baseBean.getPropValue("lwgdSalaryReport", "fund_report_only_com_category_ids").split(",")) + // .filter(org.apache.commons.lang3.math.NumberUtils::isCreatable).collect(Collectors.toList()); // 获取所有的福利项信息 - List iCategoryPOS = getICategoryMapper().listAll(); - Map iCategoryMap = SalaryEntityUtil.convert2Map(iCategoryPOS, po -> Utils.null2String(po.getId()), ICategoryPO::getInsuranceName); + // List iCategoryPOS = getICategoryMapper().listAll(); + // 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 + "_per")); - columns.add(new WeaTableColumnGroup("150", "单位缴存金额", categoryId + "_com")); + columns.add(new WeaTableColumnGroup("150", "个人缴存额", categoryId + "_per")); + columns.add(new WeaTableColumnGroup("150", "单位缴存额", categoryId + "_com")); // if (categoryOnlyComIds.contains(categoryId)) { // childrenGroup.add(new WeaTableColumnGroup("150", "基数", categoryId + "_base")); // childrenGroup.add(new WeaTableColumnGroup("150", "比例", categoryId + "_comProp"));