From 9e530fa2aee385cb331e3c76d0765e78c40e35f7 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 10 十月 2024 13:44:08 +0800
Subject: [PATCH] 1.增加基类是ID是string且是逻辑删的 2.财务报表-合伙人报表
---
src/main/resources/mapper/flower/FlowerMarkupPsSpMapper.xml | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMarkupPsSpMapper.xml b/src/main/resources/mapper/flower/FlowerMarkupPsSpMapper.xml
index 5690dfd..af658e6 100644
--- a/src/main/resources/mapper/flower/FlowerMarkupPsSpMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMarkupPsSpMapper.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>
--
Gitblit v1.9.3