From 111dd269c05125ef77f7e4e2ee0887f3498df468 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 1 Apr 2025 11:44:11 +0800
Subject: [PATCH] 2025-03-31

---
 .../quotation/QuotationInformationMapper.xml  | 108 ++++++++++--------
 1 file changed, 59 insertions(+), 49 deletions(-)

diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index 8d968e88..a6e49a07 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -421,68 +421,78 @@
 
     <select id="searchQuotationByQuotationNoList" resultType="com.spring.modules.quotation.vo.QuotationInformationVo">
         SELECT
-        site,
-        quotation_no,
-        customer_no,
-        dbo.plm_get_customer_desc(site, customer_no) as customerDesc,
-        dbo.plm_get_customer_currency(site, customer_no) as customerCurrency,
-        project_id,
-        dbo.plm_get_project_name(site, project_id) as projectName,
-        dbo.plm_get_project_final_customer_id(site, project_id) as finalCustomerId,
-        dbo.plm_get_dictDataLabel('finalCustomer', dbo.plm_get_project_final_customer_id(site, project_id),
-        site)                             as finalCustomerName,        tracker,
-        dbo.plm_get_user_display(site, tracker) as trackerName,
-        quoter,
-        dbo.plm_get_user_display(site, quoter) as quoterName,
-        quotation_status,
-        test_part_no,
-        dbo.plm_get_test_part_desc(site, test_part_no) as partName,
-        priority_level,
-        required_completion_date,
-        remark,
-        technical_considerations,
-        customer_responsible_person,
-        customer_responsible_person_phone,
-        create_date,
-        create_by,
-        update_date,
-        update_by,
-        next_to_do,
-        actuality_quotation_date,
-        quotation_result_information,
-        actuality_submission_date,
-        submission_method,
-        submission_remark,
-        actuality_reply_date,
-        confirm_results,
-        confirm_by,
-        confirm_information,
-        quotation_result_status,
-        quotation_batch_no,
-        quotation_item_no,
-        quotation_amount
-        FROM plm_quotation_information
+        pqi.site,
+        pqi.quotation_no,
+        pqi.customer_no,
+        dbo.plm_get_customer_desc(pqi.site, pqi.customer_no) as customerDesc,
+        dbo.plm_get_customer_currency(pqi.site, pqi.customer_no) as customerCurrency,
+        pqi.project_id,
+        dbo.plm_get_project_name(pqi.site, pqi.project_id) as projectName,
+        dbo.plm_get_project_final_customer_id(pqi.site, pqi.project_id) as finalCustomerId,
+        dbo.plm_get_dictDataLabel('finalCustomer', dbo.plm_get_project_final_customer_id(pqi.site, pqi.project_id),pqi.site)                             as finalCustomerName,
+        pqi.tracker,
+        dbo.plm_get_user_display(pqi.site, pqi.tracker) as trackerName,
+        pqi.quoter,
+        dbo.plm_get_user_display(pqi.site, pqi.quoter) as quoterName,
+        pqi.quotation_status,
+        pqi.test_part_no,
+        dbo.plm_get_test_part_desc(pqi.site, pqi.test_part_no) as partName,
+        pqi.priority_level,
+        pqi.required_completion_date,
+        pqi.remark,
+        pqi.technical_considerations,
+        pqi.customer_responsible_person,
+        pqi.customer_responsible_person_phone,
+        pqi.create_date,
+        pqi.create_by,
+        pqi.update_date,
+        pqi.update_by,
+        pqi.next_to_do,
+        pqi.actuality_quotation_date,
+        pqi.quotation_result_information,
+        pqi.actuality_submission_date,
+        pqi.submission_method,
+        pqi.submission_remark,
+        pqi.actuality_reply_date,
+        pqi.confirm_results,
+        pqi.confirm_by,
+        pqi.confirm_information,
+        pqi.quotation_result_status,
+        pqi.quotation_batch_no,
+        pqi.quotation_item_no,
+        pqi.quotation_amount
+        FROM plm_quotation_information pqi
+        left join plm_project_info ppi on pqi.site = ppi.site and pqi.project_id = ppi.project_id
         <where>
-            site = #{site}
+            and pqi.site = #{site}
             <if test = "quotationNo != null and quotationNo != ''">
-                AND quotation_no like #{quotationNo}
+                AND pqi.quotation_no like #{quotationNo}
             </if>
             <if test = "quotationBatchNo != null and quotationBatchNo != ''">
-                AND quotation_batch_no like #{quotationBatchNo}
+                AND pqi.quotation_batch_no like #{quotationBatchNo}
             </if>
             <if test = "quotationItemNo != null">
-                AND quotation_item_no = #{quotationItemNo}
+                AND pqi.quotation_item_no = #{quotationItemNo}
             </if>
             <if test = " testPartNo != null and testPartNo != ''">
-                AND test_part_no like #{testPartNo}
+                AND pqi.test_part_no like #{testPartNo}
             </if>
             <if test = "partName != null and partName != ''">
-                AND dbo.plm_get_test_part_desc(site, test_part_no)  like #{partName}
+                AND dbo.plm_get_test_part_desc(pqi.site, pqi.test_part_no)  like #{partName}
             </if>
             <if test="quotationStatus != null and quotationStatus != ''">
-                and quotation_status = #{quotationStatus}
+                and pqi.quotation_status = #{quotationStatus}
+            </if>
+            <if test="projectName != null and projectName != ''">
+                and ppi.project_name like #{projectName}
+            </if>
+            <if test="finalCustomerName != null and finalCustomerName != ''">
+                and dbo.plm_get_dictDataLabel('finalCustomer', dbo.plm_get_project_final_customer_id(pqi.site, pqi.project_id),pqi.site) like #{finalCustomerName}
+            </if>
+            <if test="quoterName != null and quoterName != ''">
+                and dbo.plm_get_user_display(pqi.site, pqi.quoter) like #{quoterName}
             </if>
-            order by quotation_batch_no desc,quotation_item_no
+            order by pqi.quotation_batch_no desc,pqi.quotation_item_no
         </where>
     </select>