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/SalesStatisticsAnalysisMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml b/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml
index 35cbbcd..c2334f9 100644
--- a/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml
+++ b/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml
@@ -62,11 +62,16 @@
         <if test="dto.registerTel!=null and dto.registerTel!=''">
             AND si.contact_tel LIKE CONCAT('%',#{dto.registerTel}, '%')
         </if>
+        <if test="dto.contactTel!=null and dto.contactTel!=''">
+            AND si.contact_tel LIKE CONCAT('%',#{dto.contactTel}, '%')
+        </if>
         <if test="dto.stationId != null">
             AND oi.station_id = #{dto.stationId}
         </if>
         <if test="dto.flowerCategory != null">
-            AND f.category = #{dto.flowerCategory}
+            AND ( f.category = #{dto.flowerCategory} or f.category in (
+            select id from t_flower_category where parent_id = #{dto.flowerCategory}
+            ))
         </if>
         <if test="dto.flowerLevel != null and dto.flowerLevel != ''">
             AND oi.flower_level = #{dto.flowerLevel}
@@ -90,6 +95,9 @@
         <if test="dto.createEndDate != null">
             AND o.payment_time &lt; #{dto.createEndDate}
         </if>
+        <if test="dto.orderField !=null and dto.orderField !=''">
+            order by ${dto.orderField} ${dto.orderType}
+        </if>
 </sql>
 
 

--
Gitblit v1.9.3