From 75f8e59e86a3f9f9b3a7be201bd441e19e51395a Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 7 Nov 2024 14:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/material/purchase/domain/PurchaseCheckInfo.java | 2 +-
 .../mapper/material/purchase/PurchaseCheckInfoMapper.xml      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
index 03c11e76..9bd53852 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
@@ -65,7 +65,7 @@ public class PurchaseCheckInfo extends BaseEntity {
     /** 物资厂家名称 */
     @Excel(name = "物资厂家名称")
     @ApiModelProperty(value = "物资厂家名称")
-    private Long supplierName;
+    private String supplier;
 
     /** 数据所属组织 */
     @Excel(name = "数据所属组织")
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
index 2965a1bb..0559b875 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="arrivalTime"    column="arrival_time"    />
         <result property="purchaser"    column="purchaser"    />
         <result property="supplierId"    column="supplier_id"    />
+        <result property="supplier"    column="supplier"    />
         <result property="taxRate"    column="tax_rate"    />
         <result property="createBy"    column="create_by"    />
         <result property="createUserName"    column="purchaser_name"    />
@@ -40,11 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             pci.id, pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.supplier_id, pci.tax_rate, pci.create_by,
             pci.create_time, pci.update_by, pci.update_time, pci.remark, pci.company_id,
-            t.task_status, t.task_type, t.code, su.user_name as create_user_name
+            t.task_status, t.task_type, t.code, su.user_name as create_user_name, msi.supplier
         from
             purchase_check_info pci
         left join tm_task t on t.task_id = pci.task_id
         left join sys_user su ON pci.create_by = su.user_id
+        left join ma_supplier_info msi on pci.supplier_id = msi.supplier_id
     </sql>
 
     <select id="selectPurchaseCheckInfoList" parameterType="com.bonus.material.purchase.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult">