From bf2a0074e66bd9ac30b302594a45e9f3eb1e4116 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 27 十一月 2024 14:23:22 +0800
Subject: [PATCH] 569-供应商列表:1.序号ID修改为供应商ID,并移动到第一列 2.增加供应商ID查询框

---
 src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
index 69ef777..50062c8 100644
--- a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
@@ -33,6 +33,19 @@
                 )
             )
         </if>
+        <if test="condition.supplierName != null and condition.supplierName != ''">
+            AND s.name LIKE concat('%', #{condition.supplierName},'%')
+        </if>
+        <if test="condition.isFee != null">
+        <choose>
+            <when test="condition.isFee == 'markup'">
+                AND sp.fee > 0
+            </when>
+            <otherwise>
+                AND (sp.fee is null or sp.fee = 0)
+            </otherwise>
+        </choose>
+        </if>
         ORDER BY f.id
     </select>
 
@@ -68,6 +81,16 @@
             )
             )
         </if>
+        <if test="condition.isFee != null">
+            <choose>
+                <when test="condition.isFee == 'markup'">
+                    AND sp.fee > 0
+                </when>
+                <otherwise>
+                    AND (sp.fee is null or sp.fee = 0)
+                </otherwise>
+            </choose>
+        </if>
         ORDER BY f.id
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3