From 44e9eb47bcd2e9ff22f9dee035aebc2f2fc0875f Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Wed, 12 Aug 2026 18:34:35 +0800 Subject: [PATCH] =?UTF-8?q?fix(system):=E5=8D=95=E4=BD=8D=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExpenseAccountApplicationService.java | 12 ++++++++++-- .../repository/po/ExpenseAccountPO.java | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java index d1c391c38..8359c1e83 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java @@ -581,7 +581,7 @@ public class ExpenseAccountApplicationService { } /** - * 根据编码和组织ID查询费用科目信息 + * 根据编码和组织ID查询 */ public ExpenseAccountPO getInfoByOrgAndCode(String subjectCode, Long organizationId) { if(!StringUtils.isNotEmpty(subjectCode)){ @@ -590,7 +590,15 @@ public class ExpenseAccountApplicationService { if(organizationId == null){ throw new ServiceException("组织ID不能为空"); } - return expenseAccountDomainService.getInfoByOrgAndCode(subjectCode, organizationId); + ExpenseAccountPO expenseAccountPO = expenseAccountDomainService.getInfoByOrgAndCode(subjectCode, organizationId); + // 组装计费单位列表：单位-单位英文 + List unit = new ArrayList<>(); + if (expenseAccountPO != null) { + unit.add(expenseAccountPO.getBillingUnit() + "-" + expenseAccountPO.getBillingUnitEn()); + unit.add(expenseAccountPO.getBillingUnit2() + "-" + expenseAccountPO.getBillingUnitEn2()); + expenseAccountPO.setUnit(unit); + } + return expenseAccountPO; } public List selectExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO){ diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/po/ExpenseAccountPO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/po/ExpenseAccountPO.java index 07cca5026..2f4f54d44 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/po/ExpenseAccountPO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/po/ExpenseAccountPO.java @@ -159,4 +159,8 @@ public class ExpenseAccountPO extends BaseVOEntity{ @ApiModelProperty("nc科目编码") private String ncSubjectCode; + + @ApiModelProperty("计费单位列表（单位-单位英文）") + private List unit; + } \ No newline at end of file