From 7e597d677cddf4f9956f063d5a1b603824e55984 Mon Sep 17 00:00:00 2001
From: duhe <duhe@ccbjb.com.cn>
Date: Tue, 4 Mar 2025 09:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E5=95=86=E6=9B=B4=E6=96=B0=20up=20by?=
 =?UTF-8?q?=20dh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SupplierManagementController.java   | 14 ++++++++++----
 .../web/datadictionary/dto/SupplierDto.java        |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java
index 338f10d9..a4324d6c 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java
@@ -19,7 +19,9 @@ import com.openhis.administration.domain.Supplier;
 import com.openhis.administration.mapper.SupplierMapper;
 import com.openhis.administration.service.ISupplierService;
 import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.AccountStatus;
 import com.openhis.common.enums.SupplierType;
+import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.datadictionary.dto.*;
@@ -84,6 +86,10 @@ public class SupplierManagementController {
         // 分页查询
         Page<SupplierDto> supplierPage =
                 HisPageUtils.selectPage(supplierMapper, queryWrapper, pageNo, pageSize, SupplierDto.class);
+        // 枚举类回显赋值
+        supplierPage.getRecords().forEach(e ->
+                        e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()))
+        );
         // 返回【病种目录列表DTO】分页
         return R.ok(supplierPage);
     }
@@ -124,14 +130,14 @@ public class SupplierManagementController {
     /**
      * 厂商/产地详细查询
      *
-     * @param supplierId 查询条件
+     * @param id 查询条件
      * @return 厂商/产地查询结果
      */
-    @GetMapping(value = "/get-supplier-detail")
-    public R<?> getSupplierDetail(@RequestParam(name = "id", required = true) String supplierId) {
+    @GetMapping(value = "/get-supplier-detail/{id}")
+    public R<?> getSupplierDetail(@PathVariable("id") Long id) {
         SupplierDto supplierDto = new SupplierDto();
         // 根据ID查询【供应商信息】
-        Supplier supplier = supplierService.getById(supplierId);
+        Supplier supplier = supplierService.getById(id);
         BeanUtils.copyProperties(supplier, supplierDto);
         return R.ok(supplierDto);
     }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java
index 89c11304..c4f145c5 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java
@@ -53,6 +53,7 @@ public class SupplierDto {
 
     /** 活动标识 */
     private Integer activeFlag;
+    private String activeFlag_enumText;
 
     /** 机构编号 */
     @JsonSerialize(using = ToStringSerializer.class)