From 871ab4152005b728f614b8df34c4f9e11e861782 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 25 十二月 2024 14:30:10 +0800
Subject: [PATCH] 1.花材：下架状态分为OFF，FORCE-OFF
---
src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml b/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
index aa62080..6da77be 100644
--- a/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
+++ b/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
@@ -125,9 +125,15 @@
))
</if>
- <if test="dto.flowerStatus !=null and dto.flowerStatus !=''">
- AND f.status = #{dto.flowerStatus}
+ <if test="dto.flowerStatus != null and dto.flowerStatus != ''">
+ <if test="dto.flowerStatus == 'OFF'">
+ AND f.status IN ('OFF', 'FORCE_OFF')
+ </if>
+ <if test="dto.flowerStatus != 'OFF'">
+ AND f.status = #{dto.flowerStatus}
+ </if>
</if>
+
<if test="dto.flowerLevel !=null and dto.flowerLevel !=''">
AND f.`level` = #{dto.flowerLevel}
</if>
--
Gitblit v1.9.3