From 1447e5d26c02de304d44f6a2465c2c4262458995 Mon Sep 17 00:00:00 2001
From: Agoni <791536664@qq.com>
Date: Wed, 30 Aug 2023 11:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=A0=87=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quotationsheet/QuotationSheetDO.java          |  2 +-
 .../QuotationSheetBiddingServiceImpl.java         | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/quotationsheet/QuotationSheetDO.java b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/quotationsheet/QuotationSheetDO.java
index 02bddbb6..06eb3601 100644
--- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/quotationsheet/QuotationSheetDO.java
+++ b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/quotationsheet/QuotationSheetDO.java
@@ -189,7 +189,7 @@ public class QuotationSheetDO extends TenantBaseDO {
     private Integer biddingStatus;
 
     private String money;
-    
+
     @TableField(exist = false)
     private String tenantName;
 
diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java
index 1926d987..3772f6b4 100644
--- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java
+++ b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.bs.service.quotationsheetbidding;
 
 import cn.iocoder.yudao.module.bs.dal.dataobject.suppliercompany.SupplierCompanyDO;
 import cn.iocoder.yudao.module.bs.dal.mysql.suppliercompany.SupplierCompanyMapper;
+import cn.iocoder.yudao.module.bs.service.suppliercompany.SupplierCompanyService;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -30,6 +31,9 @@ public class QuotationSheetBiddingServiceImpl extends MPJBaseServiceImpl<Quotati
     @Resource
     private QuotationSheetBiddingMapper quotationSheetBiddingMapper;
 
+    @Resource
+    private SupplierCompanyService supplierCompanyService;
+
     @Override
     public Long createQuotationSheetBidding(QuotationSheetBiddingCreateReqVO createReqVO) {
         // 插入
@@ -74,7 +78,16 @@ public class QuotationSheetBiddingServiceImpl extends MPJBaseServiceImpl<Quotati
 
     @Override
     public PageResult<QuotationSheetBiddingDO> getQuotationSheetBiddingPage(QuotationSheetBiddingPageReqVO pageReqVO) {
-        return quotationSheetBiddingMapper.selectPage(pageReqVO);
+        PageResult<QuotationSheetBiddingDO> quotationSheetBiddingDOPageResult = quotationSheetBiddingMapper.selectPage(pageReqVO);
+        if (null!=quotationSheetBiddingDOPageResult&&quotationSheetBiddingDOPageResult.getList().size()>0){
+            quotationSheetBiddingDOPageResult.getList().forEach(s->{
+                SupplierCompanyDO supplierCompanyDO = supplierCompanyService.getById(s.getCompanyId());
+                if (null!=supplierCompanyDO){
+                    s.setCompanyName(supplierCompanyDO.getCompanyAme());
+                }
+            });
+        }
+        return quotationSheetBiddingDOPageResult;
     }
 
     @Override