From 3f16158fce2e445a434d599dd22ddcd74e7ee500 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 16 Sep 2025 11:33:24 +0800
Subject: [PATCH] =?UTF-8?q?2025-09-16=20=E5=BE=85=E6=8A=A5=E4=BB=B7?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=9F=A5=E8=AF=A2sql=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QuotationInformationController.java       |  10 ++
 .../mapper/QuotationInformationMapper.java    |   2 +
 .../service/QuotationInformationService.java  |   2 +
 .../impl/QuotationInformationServiceImpl.java |  12 ++
 .../quotation/QuotationInformationMapper.xml  | 144 ++++++++++++++++++
 5 files changed, 170 insertions(+)

diff --git a/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java b/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java
index d3d199dc..b142a859 100644
--- a/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java
+++ b/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java
@@ -311,4 +311,14 @@ public class QuotationInformationController {
         quotationInformationService.quotationInformationEditStatus(data);
         return R.ok();
     }
+
+    /**
+     * 报价信息列表
+     **/
+    @PostMapping(value = "/quotationInformationSearch2")
+    @ResponseBody
+    public R quotationInformationSearch2(@RequestBody QuotationInformationVo data) {
+        PageUtils page = quotationInformationService.quotationInformationSearch2(data);
+        return R.ok().put("page", page);
+    }
 }
diff --git a/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java b/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java
index 476d58e1..1e36245e 100644
--- a/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java
+++ b/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java
@@ -22,6 +22,8 @@ import java.util.Map;
 public interface QuotationInformationMapper extends BaseMapper<QuotationInformationEntity> {
     IPage<QuotationInformationVo> quotationInformationSearch(Page<QuotationInformationVo> quotationInformationVoPage, @Param("query") QuotationInformationVo data);
 
+    IPage<QuotationInformationVo> quotationInformationSearch2(Page<QuotationInformationVo> quotationInformationVoPage, @Param("query") QuotationInformationVo data);
+
     List<SysOssEntity> getFileContentList(SysOssEntity data);
 
     String getQuotationNo(QuotationInformationEntity data);
diff --git a/src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java b/src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java
index 7953d496..6b56f527 100644
--- a/src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java
+++ b/src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java
@@ -74,4 +74,6 @@ public interface QuotationInformationService extends IService<QuotationInformati
     void quotationInformationEditStatus(QuotationInformationVo data);
 
     PageUtils quotationInformationSearchAny(QuerySavedVo data);
+
+    PageUtils quotationInformationSearch2(QuotationInformationVo data);
 }
diff --git a/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java b/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java
index 06bdaa07..fdd310cc 100644
--- a/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java
@@ -130,6 +130,18 @@ public class QuotationInformationServiceImpl extends ServiceImpl<QuotationInform
         return new PageUtils(resultList);
     }
 
+    /**
+     * 报价信息列表
+     **/
+    @Override
+    public PageUtils quotationInformationSearch2(QuotationInformationVo data) {
+        if (StringUtils.hasText(data.getQuotationBatchNo())){
+            data.setQuotationBatchNo(data.getQuotationBatchNo().toUpperCase());
+        }
+        IPage<QuotationInformationVo> resultList = this.quotationInformationMapper.quotationInformationSearch2(new Page<QuotationInformationVo>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(resultList);
+    }
+
     /**
      * @description: 报价信息新增
      * @author: fengyuan_yang
diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index c13ea62a..90995bce 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -136,6 +136,150 @@
         left join view_Project_Part vpp on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id
         left join BU b on vpp.bu_no = b.bu_no and a.site = b.site
         left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and a.customer_no = pcpi.customer_no
+        <where>
+            a.site = #{query.site}
+            <if test="query.createBy != null and query.createBy != ''">
+                and vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, #{query.createBy}))
+            </if>
+            <if test="query.quotationNo != null and query.quotationNo != ''">
+                AND a.quotation_no like #{query.quotationNo}
+            </if>
+            <if test="query.quotationBatchNo != null and query.quotationBatchNo != ''">
+                AND a.quotation_batch_no like #{query.quotationBatchNo}
+            </if>
+            <if test="query.quotationItemNo != null and query.quotationItemNo != ''">
+                AND a.quotation_item_no = #{query.quotationItemNo}
+            </if>
+            <if test="query.customerNo != null and query.customerNo != ''">
+                AND a.customer_no like #{query.customerNo}
+            </if>
+            <if test="query.customerDesc != null and query.customerDesc != ''">
+                AND dbo.plm_get_customer_desc(a.site, a.customer_no) like #{query.customerDesc}
+            </if>
+            <if test="query.projectId != null and query.projectId != ''">
+                AND a.project_id like #{query.projectId}
+            </if>
+            <if test="query.projectName != null and query.projectName != ''">
+                AND dbo.plm_get_project_name(a.site, a.project_id) like #{query.projectName}
+            </if>
+            <if test="query.trackerName != null and query.trackerName != ''">
+                AND dbo.plm_get_user_display(a.site, a.tracker) like #{query.trackerName}
+            </if>
+            <if test="query.quoterName != null and query.quoterName != ''">
+                AND dbo.plm_get_user_display(a.site, a.quoter) like #{query.quoterName}
+            </if>
+            <if test="query.testPartNo != null and query.testPartNo != ''">
+                AND a.test_part_no like #{query.testPartNo}
+            </if>
+            <if test="query.partName != null and query.partName != ''">
+                AND dbo.plm_get_test_part_desc(a.site, a.test_part_no) like #{query.partName}
+            </if>
+            <if test="query.quotationStatus != null and query.quotationStatus != ''">
+                AND a.quotation_status = #{query.quotationStatus}
+            </if>
+            <if test="query.priorityLevel != null and query.priorityLevel != ''">
+                AND a.priority_level = #{query.priorityLevel}
+            </if>
+            <if test="query.startDate != null">
+                AND a.required_completion_date >= #{query.startDate}
+            </if>
+            <if test="query.endDate != null">
+                AND #{query.endDate} >= a.required_completion_date
+            </if>
+            <if test="query.quotationResultStatus != null and query.quotationResultStatus != ''">
+                AND a.quotation_result_status = #{query.quotationResultStatus}
+            </if>
+            <if test="query.buNo != null and query.buNo != ''">
+                and b.bu_no = #{query.buNo}
+            </if>
+            <if test="query.finalPartNo != null and query.finalPartNo != ''">
+                and vpp.final_part_no like #{query.finalPartNo}
+            </if>
+            <if test="query.customerPartNo != null and query.customerPartNo != ''">
+                and pcpi.customer_part_no like #{query.customerPartNo}
+            </if>
+            <if test="query.nodeId != null and query.nodeId != ''">
+                AND d.node_id = #{query.nodeId}
+            </if>
+            <if test="query.approvalUsername != null and query.approvalUsername != ''">
+                AND dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.quotation_batch_no) like #{query.approvalUsername}
+            </if>
+            order by a.quotation_batch_no desc, a.quotation_item_no
+        </where>
+    </select>
+
+    <select id="quotationInformationSearch2" resultMap="getQuotation" parameterType="com.spring.modules.quotation.vo.QuotationInformationVo">
+        SELECT a.site,
+        a.quotation_no,
+        a.customer_no,
+        dbo.plm_get_customer_desc(a.site, a.customer_no)                      as customerDesc,
+        dbo.plm_get_customer_currency(a.site, a.customer_no)                  as customerCurrency,
+        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,
+        a.tracker,
+        dbo.plm_get_user_display(a.site, a.tracker)                           as trackerName,
+        quoter,
+        dbo.plm_get_user_display(a.site, a.quoter)                            as quoterName,
+        a.quotation_status,
+        a.test_part_no,
+        dbo.plm_get_test_part_desc(a.site, a.test_part_no)                    as partName,
+        a.priority_level,
+        a.required_completion_date,
+        a.remark,
+        a.technical_considerations,
+        a.customer_responsible_person,
+        a.customer_responsible_person_phone,
+        a.create_date,
+        a.create_by,
+        a.update_date,
+        a.update_by,
+        a.next_to_do,
+        a.actuality_quotation_date,
+        a.quotation_result_information,
+        a.actuality_submission_date,
+        a.submission_method,
+        a.submission_remark,
+        a.actuality_reply_date,
+        a.confirm_results,
+        a.confirm_by,
+        a.confirm_information,
+        a.quotation_result_status,
+        a.quotation_batch_no,
+        a.quotation_item_no,
+        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,
+        a.quotation_amount,
+        a.customer_quote_no,
+        a.sourcing,
+        a.step_id,
+        a.reject_flag,
+        a.reject_step_id,
+        a.place,
+        vpp.plm_part_no,
+        <if test="query.menuId != null and query.menuId != ''">
+            d.is_reject,
+            d.node_id,
+            d.node_name,
+            dbo.plm_get_user_display(d.site, d.create_by)                                         as node_create_by,
+            dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.quotation_batch_no) as approvalUsername,
+        </if>
+        vpp.bu_no,
+        b.bu_desc,
+        vpp.final_part_no,
+        pcpi.customer_part_no
+        FROM plm_quotation_information as a
+        <if test="query.menuId != null and query.menuId != ''">
+            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
+        </if>
+        left join view_Project_Part vpp on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id
+        left join BU b on vpp.bu_no = b.bu_no and a.site = b.site
+        left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and a.customer_no = pcpi.customer_no
         <where>
             a.site = #{query.site}
             and a.quotation_no not in (select inside_inquiry_no from  plm_quote where  site = #{query.site})