From 2390d668f77641f9b62e1e210d855df87ee7d390 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 29 十二月 2024 13:11:55 +0800
Subject: [PATCH] add:阿里云短信模板获取签名和模板信息5
---
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