From ca57e98eea87ce16da12ff5ad242453ebe7d6deb Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Mon, 3 Jun 2024 16:37:43 +0800
Subject: [PATCH] 2024-06-03

---
 .../entity/QuotationInformationEntity.java    |   2 +
 .../quotation/QuotationInformationMapper.xml  | 133 +++++++++---------
 2 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/src/main/java/com/spring/modules/quotation/entity/QuotationInformationEntity.java b/src/main/java/com/spring/modules/quotation/entity/QuotationInformationEntity.java
index a8c3f917..432d3339 100644
--- a/src/main/java/com/spring/modules/quotation/entity/QuotationInformationEntity.java
+++ b/src/main/java/com/spring/modules/quotation/entity/QuotationInformationEntity.java
@@ -173,4 +173,6 @@ public class QuotationInformationEntity extends QueryPage implements Serializabl
 
     private Integer rejectStepId;
 
+    private String sourcing;
+
 }
diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index 614c7c70..ea59ff21 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -45,6 +45,7 @@
         <result column="quoteTypeLabel" property="quoteTypeLabel"/>
         <result column="deliveryTermsLabel" property="deliveryTermsLabel"/>
         <result column="finalCustomerId" property="finalCustomerId"/>
+        <result column="sourcing" property="sourcing"/>
         <result column="finalCustomerName" property="finalCustomerName"/>
         <result column="quotation_amount" property="quotationAmount"/>
         <result column="customer_quote_no" property="customerQuoteNo"/>
@@ -60,59 +61,61 @@
     </resultMap>
     <!-- 报价信息列表 -->
     <select id="quotationInformationSearch" resultMap="getQuotation" parameterType="com.spring.modules.quotation.vo.QuotationInformationVo">
-        SELECT
-            a.site,
-            a.quotation_no,
-            customer_no,
-            dbo.plm_get_customer_desc(a.site, customer_no) as customerDesc,
-            dbo.plm_get_customer_currency(a.site, customer_no) as customerCurrency,
-            project_id,
-            dbo.plm_get_project_name(a.site, project_id) as projectName,
-            dbo.plm_get_project_final_customer_id(a.site, project_id) as finalCustomerId,
-            dbo.plm_get_customer_desc(a.site, dbo.plm_get_project_final_customer_id(a.site, project_id)) as finalCustomerName,
-            tracker,
-            dbo.plm_get_user_display(a.site, tracker) as trackerName,
-            quoter,
-            dbo.plm_get_user_display(a.site, quoter) as quoterName,
-            quotation_status,
-            test_part_no,
-            dbo.plm_get_test_part_desc(a.site, test_part_no) as partName,
-            priority_level,
-            required_completion_date,
-            a.remark,
-            technical_considerations,
-            customer_responsible_person,
-            customer_responsible_person_phone,
-            a.create_date,
-            a.create_by,
-            a.update_date,
-            a.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,
-            delivery_terms,
-            quote_type,
-            dbo.plm_get_dictDataLabel('quote_type',quote_type,a.site) as quoteTypeLabel,
-            dbo.plm_get_dictDataLabel('delivery_terms',delivery_terms,a.site) as deliveryTermsLabel,
-            quotation_amount,
-            customer_quote_no,
-            a.step_id,
-            a.reject_flag,
-            a.reject_step_id,
-            d.is_reject
+        SELECT a.site,
+               a.quotation_no,
+               customer_no,
+               dbo.plm_get_customer_desc(a.site, customer_no)                                               as customerDesc,
+               dbo.plm_get_customer_currency(a.site, customer_no)                                           as customerCurrency,
+               project_id,
+               dbo.plm_get_project_name(a.site, project_id)                                                 as projectName,
+               dbo.plm_get_project_final_customer_id(a.site, project_id)                                    as finalCustomerId,
+               dbo.plm_get_customer_desc(a.site,
+                                         dbo.plm_get_project_final_customer_id(a.site, project_id))         as finalCustomerName,
+               tracker,
+               dbo.plm_get_user_display(a.site, tracker)                                                    as trackerName,
+               quoter,
+               dbo.plm_get_user_display(a.site, quoter)                                                     as quoterName,
+               quotation_status,
+               test_part_no,
+               dbo.plm_get_test_part_desc(a.site, test_part_no)                                             as partName,
+               priority_level,
+               required_completion_date,
+               a.remark,
+               technical_considerations,
+               customer_responsible_person,
+               customer_responsible_person_phone,
+               a.create_date,
+               a.create_by,
+               a.update_date,
+               a.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,
+               delivery_terms,
+               quote_type,
+               dbo.plm_get_dictDataLabel('quote_type', quote_type, a.site)                                  as quoteTypeLabel,
+               dbo.plm_get_dictDataLabel('delivery_terms', delivery_terms, a.site)                          as deliveryTermsLabel,
+               quotation_amount,
+               customer_quote_no,
+               sourcing,
+               a.step_id,
+               a.reject_flag,
+               a.reject_step_id,
+               d.is_reject
         FROM plm_quotation_information as a
-        left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}
-        left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id
+                 left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}
+                 left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and
+                                                    prh.workflow_id = d.workflow_id and a.step_id = d.step_id
         <where>
             a.site = #{query.site}
             <if test="query.quotationNo != null and query.quotationNo != ''">
@@ -124,46 +127,46 @@
             <if test="query.quotationItemNo != null and query.quotationItemNo != ''">
                 AND quotation_item_no = #{query.quotationItemNo}
             </if>
-            <if test = "query.customerNo != null and query.customerNo != ''">
+            <if test="query.customerNo != null and query.customerNo != ''">
                 AND customer_no like #{query.customerNo}
             </if>
-            <if test = "query.customerDesc != null and query.customerDesc != ''">
+            <if test="query.customerDesc != null and query.customerDesc != ''">
                 AND dbo.plm_get_customer_desc(a.site, customer_no) like #{query.customerDesc}
             </if>
-            <if test = "query.projectId != null and query.projectId != ''">
+            <if test="query.projectId != null and query.projectId != ''">
                 AND project_id like #{query.projectId}
             </if>
-            <if test = "query.projectName != null and query.projectName != ''">
+            <if test="query.projectName != null and query.projectName != ''">
                 AND dbo.plm_get_project_name(a.site, project_id) like #{query.projectName}
             </if>
-            <if test = "query.trackerName != null and query.trackerName != ''">
+            <if test="query.trackerName != null and query.trackerName != ''">
                 AND dbo.plm_get_user_display(a.site, tracker) like #{query.trackerName}
             </if>
-            <if test = "query.quoterName != null and query.quoterName != ''">
+            <if test="query.quoterName != null and query.quoterName != ''">
                 AND dbo.plm_get_user_display(a.site, quoter) like #{query.quoterName}
             </if>
-            <if test = "query.testPartNo != null and query.testPartNo != ''">
+            <if test="query.testPartNo != null and query.testPartNo != ''">
                 AND test_part_no like #{query.testPartNo}
             </if>
-            <if test = "query.partName != null and query.partName != ''">
+            <if test="query.partName != null and query.partName != ''">
                 AND dbo.plm_get_test_part_desc(a.site, test_part_no) like #{query.partName}
             </if>
-            <if test = "query.quotationStatus != null and query.quotationStatus != ''">
+            <if test="query.quotationStatus != null and query.quotationStatus != ''">
                 AND quotation_status = #{query.quotationStatus}
             </if>
-            <if test = "query.priorityLevel != null and query.priorityLevel != ''">
+            <if test="query.priorityLevel != null and query.priorityLevel != ''">
                 AND priority_level = #{query.priorityLevel}
             </if>
-            <if test="query.startDate != null ">
+            <if test="query.startDate != null">
                 AND required_completion_date >= #{query.startDate}
             </if>
-            <if test="query.endDate != null ">
+            <if test="query.endDate != null">
                 AND #{query.endDate} >= required_completion_date
             </if>
             <if test="query.quotationResultStatus != null and query.quotationResultStatus != ''">
                 AND quotation_result_status = #{query.quotationResultStatus}
             </if>
-            order by quotation_batch_no desc,quotation_item_no
+            order by quotation_batch_no desc, quotation_item_no
         </where>
     </select>