From 3879a328142730bd9936913553acadd901953464 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 26 Feb 2025 10:09:11 +0800
Subject: [PATCH] 2025-02-26

---
 .../mapper/quotation/QuotationInformationMapper.xml    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index 4538ff09..d1ef8dff 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -57,6 +57,10 @@
         <result column="final_part_no" property="finalPartNo"/>
         <result column="customer_part_no" property="customerPartNo"/>
         <result column="node_create_by" property="nodeCreateBy"/>
+        <result column="approvalUsername" property="approvalUsername"/>
+        <result column="step_id" property="stepId"/>
+        <result column="reject_flag" property="rejectFlag"/>
+        <result column="reject_step_id" property="rejectStepId"/>
     </resultMap>
     <!-- 报价信息列表 -->
     <select id="quotationInformationSearch" resultMap="getQuotation" parameterType="com.spring.modules.quotation.vo.QuotationInformationVo">
@@ -68,8 +72,7 @@
                a.project_id,
                dbo.plm_get_project_name(a.site, a.project_id)                as projectName,
                dbo.plm_get_project_final_customer_id(a.site, a.project_id)   as finalCustomerId,
-               dbo.plm_get_dictDataLabel('finalCustomer', dbo.plm_get_project_final_customer_id(a.site, a.project_id),
-                                         a.site)                             as finalCustomerName,
+               dbo.plm_get_dictDataLabel('finalCustomer', dbo.plm_get_project_final_customer_id(a.site, a.project_id),a.site)                             as finalCustomerName,
                a.tracker,
                dbo.plm_get_user_display(a.site, a.tracker)                   as trackerName,
                quoter,
@@ -103,8 +106,7 @@
                a.delivery_terms,
                a.quote_type,
                dbo.plm_get_dictDataLabel('quote_type', a.quote_type, a.site) as quoteTypeLabel,
-               dbo.plm_get_dictDataLabel('delivery_terms', a.delivery_terms,
-                                         a.site)                             as deliveryTermsLabel,
+               dbo.plm_get_dictDataLabel('delivery_terms', a.delivery_terms,a.site)                             as deliveryTermsLabel,
                a.quotation_amount,
                a.customer_quote_no,
                a.sourcing,