From cd2ed591a01abcaef8dac4cc5ad3b398abacbaef Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 11:13:41 +0800
Subject: [PATCH] feat: 环境配置

---
 src/main/resources/mapper/sales/SalesQuotationMapper.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/sales/SalesQuotationMapper.xml b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
index 8036e2f..ff151a5 100644
--- a/src/main/resources/mapper/sales/SalesQuotationMapper.xml
+++ b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
@@ -4,18 +4,23 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.sales.mapper.SalesQuotationMapper">
     <select id="listPage" resultType="com.ruoyi.sales.dto.SalesQuotationDto">
-        SELECT t1.*
+        SELECT t1.*, p.title as projectName
         FROM sales_quotation t1
+        LEFT JOIN project_management_info p ON t1.project_id = p.id
         <where>
             <if test="salesQuotationDto.quotationNo != null and salesQuotationDto.quotationNo != '' ">
                 AND t1.quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
             </if>
             <if test="salesQuotationDto.customer != null and salesQuotationDto.customer != '' ">
-                AND t1.customer = #{salesQuotationDto.customer}
+                AND t1.customer LIKE CONCAT('%',#{salesQuotationDto.customer},'%')
             </if>
             <if test="salesQuotationDto.status != null and salesQuotationDto.status != '' ">
                 AND t1.status = #{salesQuotationDto.status}
             </if>
+            <if test="salesQuotationDto.projectId != null">
+                AND t1.project_id = #{salesQuotationDto.projectId}
+            </if>
         </where>
+        order by t1.id desc
     </select>
 </mapper>

--
Gitblit v1.9.3