From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:31:12 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml b/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
index 6da77be..67746bd 100644
--- a/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
+++ b/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
@@ -125,15 +125,18 @@
))
</if>
- <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.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.flowerStatus != null and dto.flowerStatus != ''">
+ AND f.status = #{dto.flowerStatus}
+ </if>
<if test="dto.flowerLevel !=null and dto.flowerLevel !=''">
AND f.`level` = #{dto.flowerLevel}
</if>
--
Gitblit v1.9.3