From ec4e20fbe72710bdeb13d5cfc5330070f8c28a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Thu, 26 Feb 2026 11:29:00 +0800 Subject: [PATCH] =?UTF-8?q?BMS=E5=88=97=E8=A1=A8=E2=80=9C=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=BA=E2=80=9D?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=94=A8=E6=88=B7=E5=A7=93=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E4=BF=9D=E5=AD=98=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExpenseAccountAssembler.java | 10 ++++- .../ServiceItemsManageAssembler.java | 10 ++++- .../expenseAccount/ExpenseAccountApi.java | 11 ++---- .../ServiceItemsManageApi.java | 12 ++---- .../mapper/basic/ExpenseAccountMapper.xml | 2 +- .../ConditionalMappingApplicationService.java | 38 +++++++++++++++++-- .../MappingMethodApplicationService.java | 38 +++++++++++++++++-- .../billingRules/BillingRulesAssembler.java | 10 ++++- .../BillingStatementAssembler.java | 20 +++++++++- .../ConditionalMappingAssembler.java | 10 ++++- .../documentType/DocumentTypeAssembler.java | 10 ++++- .../mappingMethod/MappingMethodAssembler.java | 10 ++++- .../SettlementCustomersAssembler.java | 10 ++++- .../facadeApi/ConditionalMappingApi.java | 6 ++- .../interfaces/facadeApi/DocumentTypeApi.java | 5 ++- .../mapper/ConditionalMappingMapper.xml | 4 ++ .../resources/mapper/MappingMethodMapper.xml | 4 ++ 17 files changed, 172 insertions(+), 38 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/expenseAccount/ExpenseAccountAssembler.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/expenseAccount/ExpenseAccountAssembler.java index 830767dbe..02f610808 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/expenseAccount/ExpenseAccountAssembler.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/expenseAccount/ExpenseAccountAssembler.java @@ -35,7 +35,15 @@ public class ExpenseAccountAssembler { if (ObjectUtil.isNull(loginUser)) { throw new DigitalLogisticsException(UserError.TIMEOUT); } - String userName = loginUser.getUsername(); + // 获取用户姓名，优先使用userPo中的userName，如果为空则使用realname，最后使用username + String userName = null; + if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null) { + userName = loginUser.getUserPo().getUserName(); + } else if (loginUser.getRealname() != null) { + userName = loginUser.getRealname(); + } else { + userName = loginUser.getUsername(); + } // 获取登录人id Long userId = loginUser.getUserid(); diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/serviceItemsManage/ServiceItemsManageAssembler.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/serviceItemsManage/ServiceItemsManageAssembler.java index d3b340d79..766d4b5ef 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/serviceItemsManage/ServiceItemsManageAssembler.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/serviceItemsManage/ServiceItemsManageAssembler.java @@ -35,7 +35,15 @@ public class ServiceItemsManageAssembler { if (ObjectUtil.isNull(loginUser)) { throw new DigitalLogisticsException(UserError.TIMEOUT); } - String userName = loginUser.getUsername(); + // 获取用户姓名，优先使用userPo中的userName，如果为空则使用realname，最后使用username + String userName = null; + if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null) { + userName = loginUser.getUserPo().getUserName(); + } else if (loginUser.getRealname() != null) { + userName = loginUser.getRealname(); + } else { + userName = loginUser.getUsername(); + } // 获取登录人id Long userId = loginUser.getUserid(); diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java index d1f0baa38..3679d7509 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java @@ -57,18 +57,13 @@ public class ExpenseAccountApi extends BaseController{ { logger.info("收到查询费用科目列表请求，参数：{}", expenseAccountDTO); try { - //转换实体，如果 expenseAccountDTO 为 null，创建一个新的对象 + //转换实体（查询时不需要设置创建人和更新人信息） if (expenseAccountDTO == null) { expenseAccountDTO = new ExpenseAccountDTO(); logger.info("expenseAccountDTO 为 null，创建新对象"); } - ExpenseAccountDO expenseAccountDO = expenseAccountAssembler.toDO(expenseAccountDTO); - if(StringUtils.isBlank(expenseAccountDTO.getCreateByName())){ - expenseAccountDO.setCreateByName(null); - } - if(StringUtils.isBlank(expenseAccountDTO.getUpdateByName())){ - expenseAccountDO.setUpdateByName(null); - } + ExpenseAccountDO expenseAccountDO = new ExpenseAccountDO(); + BeanUtils.copyProperties(expenseAccountDTO, expenseAccountDO); logger.info("转换后的 ExpenseAccountDO：{}", expenseAccountDO); startPage(); logger.info("分页参数已设置"); diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/serviceItemsManage/ServiceItemsManageApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/serviceItemsManage/ServiceItemsManageApi.java index b862613d7..60b213989 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/serviceItemsManage/ServiceItemsManageApi.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/serviceItemsManage/ServiceItemsManageApi.java @@ -9,6 +9,7 @@ import com.mhd.basic.interfaces.assember.serviceItemsManage.ServiceItemsManageAs import com.mhd.basic.interfaces.dto.serviceItemsManage.ServiceItemsManageDTO; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -39,14 +40,9 @@ public class ServiceItemsManageApi extends BaseController{ @GetMapping("/list") public TableDataInfo list(ServiceItemsManageDTO serviceItemsManageDTO) { - //转换实体 - ServiceItemsManageDO serviceItemsManageDO = serviceItemsManageAssembler.toDO(serviceItemsManageDTO); - if(StringUtils.isBlank(serviceItemsManageDTO.getCreateByName())){ - serviceItemsManageDO.setCreateByName(null); - } - if(StringUtils.isBlank(serviceItemsManageDTO.getUpdateByName())){ - serviceItemsManageDO.setUpdateByName(null); - } + //转换实体（查询时不需要设置创建人和更新人信息） + ServiceItemsManageDO serviceItemsManageDO = new ServiceItemsManageDO(); + BeanUtils.copyProperties(serviceItemsManageDTO, serviceItemsManageDO); startPage(); List list = serviceItemsManageApplicationService.queryList(serviceItemsManageDO); return getDataTable(list); diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml index 41cf1fdd0..c1cfa8aee 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml @@ -102,7 +102,7 @@ WHERE a.del_flag = 1 - order by a.update_time DESC + order by a.create_time DESC AND top_organization_id = #{conditionalMappingDO.topOrganizationId} + + AND organization_id = #{conditionalMappingDO.organizationId} + AND source_content like concat('%', #{conditionalMappingDO.sourceContent}, '%') diff --git a/mhd_bms/src/main/resources/mapper/MappingMethodMapper.xml b/mhd_bms/src/main/resources/mapper/MappingMethodMapper.xml index b757f6179..bd5cc8a84 100644 --- a/mhd_bms/src/main/resources/mapper/MappingMethodMapper.xml +++ b/mhd_bms/src/main/resources/mapper/MappingMethodMapper.xml @@ -14,12 +14,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from mapping_method where del_flag = 1 + ORDER BY create_time DESC AND top_organization_id = #{mappingMethodDO.topOrganizationId} + + AND organization_id = #{mappingMethodDO.organizationId} + and method_name like concat('%', #{mappingMethodDO.methodName}, '%')