From dce840653b78fc05a732c5c89773c74e15dbed09 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 17:41:27 +0800
Subject: [PATCH] 采购管理系统模块优化

---
 src/main/resources/mapper/basic/SupplierManageMapper.xml |   56 +++++++++++++++++++++++---------------------------------
 1 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 9e65903..efec4d0 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -6,58 +6,48 @@
 
     <select id="supplierListPage" resultType="com.ruoyi.basic.dto.SupplierManageDto">
         SELECT
-        T1.id,
-        T1.supplier_name,
-        T1.taxpayer_identification_num,
-        T1.company_address,
-        T1.company_phone,
-        T1.bank_account_name,
-        T1.bank_account_num,
-        T1.contact_user_name,
-        T1.contact_user_phone,
-        T1.maintain_user_id,
-        T1.maintain_time,
-        T1.create_time,
-        T1.create_user,
-        T1.update_time,
-        T1.update_user,
-        T1.tenant_id,
+        T1.*,
         T2.nick_name AS maintainUserName
         FROM supplier_manage T1
         LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
         <where>
+            T1.tenant_id = #{supplierManageDto.tenantId}
+            AND T1.delete_flag = 0
             <if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
                 AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
             </if>
+            <if test="supplierManageDto.supplierCode != null and supplierManageDto.supplierCode != ''">
+                AND T1.supplier_code LIKE CONCAT('%',#{supplierManageDto.supplierCode},'%')
+            </if>
+            <if test="supplierManageDto.productKeyword != null and supplierManageDto.productKeyword != ''">
+                AND EXISTS (SELECT 1 FROM supplier_product SP WHERE SP.supplier_id=T1.id AND SP.tenant_id=T1.tenant_id AND SP.delete_flag=0 AND SP.product_name LIKE CONCAT('%',#{supplierManageDto.productKeyword},'%'))
+            </if>
+            <if test="supplierManageDto.supplierLevel != null and supplierManageDto.supplierLevel != ''">
+                AND T1.supplier_level = #{supplierManageDto.supplierLevel}
+            </if>
+            <if test="supplierManageDto.cooperationStatus != null">
+                AND T1.cooperation_status = #{supplierManageDto.cooperationStatus}
+            </if>
+            <if test="supplierManageDto.qualificationStatus != null">
+                AND T1.qualification_status = #{supplierManageDto.qualificationStatus}
+            </if>
         </where>
+        ORDER BY T1.id DESC
     </select>
 
     <select id="supplierExportList" resultType="com.ruoyi.basic.excel.SupplierManageExcelDto">
         SELECT
-        T1.id,
-        T1.supplier_name,
-        T1.taxpayer_identification_num,
-        T1.company_address,
-        T1.company_phone,
-        T1.bank_account_name,
-        T1.bank_account_num,
-        T1.contact_user_name,
-        T1.contact_user_phone,
-        T1.maintain_user_id,
-        T1.maintain_time,
-        T1.create_time,
-        T1.create_user,
-        T1.update_time,
-        T1.update_user,
-        T1.tenant_id,
+        T1.*,
         T2.nick_name AS maintainUserName
         FROM supplier_manage T1
         LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
         <where>
+            T1.tenant_id = #{supplierManageDto.tenantId}
+            AND T1.delete_flag = 0
             <if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
                 AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
             </if>
         </where>
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3