From 9e8f6d9efd659a816ede51d4bc9e57393816509c Mon Sep 17 00:00:00 2001
From: zhangluping <1801075613@qq.com>
Date: Fri, 20 Dec 2024 13:52:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/mapper/StatisticsMapper.java  | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/StatisticsMapper.java b/src/main/java/com/example/demo/mapper/StatisticsMapper.java
index 0550cac..3737e2f 100644
--- a/src/main/java/com/example/demo/mapper/StatisticsMapper.java
+++ b/src/main/java/com/example/demo/mapper/StatisticsMapper.java
@@ -209,7 +209,7 @@ public interface StatisticsMapper {
                     "GROUP BY month ORDER BY month ASC"
     })
 
-    List<SumCoin> getMediuPayCoin(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime);
+    List<SumCoin> getMediuPayCoin(@Param("searchStartTime") Date StartTime, @Param("searchEndTime") Date searchEndTime);
 
 
     //本年--1
@@ -220,16 +220,19 @@ public interface StatisticsMapper {
 //                   "GROUP BY month ORDER BY month asc"
 //    })
     @Select({
-            "SELECT DATE_FORMAT(create_time, '%Y-%m') AS month," +
-                    "       SUM(recharge_coin) AS rechargeSumCoin," +
-                    "       SUM(free_coin) AS freeSumCoin," +
-                    "       SUM(task_coin) AS taskSumCoin" +
-                    " FROM detail" +
-                    " WHERE create_time >= #{searchStartTime}" +
-                    "  AND create_time <= #{searchEndTime}" +
-                    "  AND update_type = '1'" +
-                    "GROUP BY month" +
-                    " ORDER BY month ASC"
+            "<script>",
+            "SELECT DATE_FORMAT(create_time, '%Y-%m') AS month,",
+            "       SUM(recharge_coin) AS rechargeSumCoin,",
+            "       SUM(free_coin) AS freeSumCoin,",
+            "       SUM(task_coin) AS taskSumCoin",
+            "FROM detail",
+            "WHERE update_type = '1'",
+            "<if test='searchStartTime != null and searchEndTime != null'>",
+            "  AND create_time BETWEEN #{searchStartTime} AND #{searchEndTime}",
+            "</if>",
+            "GROUP BY month",
+            "ORDER BY month ASC",
+            "</script>"
     })
 
     List<SumCoin> getMediuConsumeCoin(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime);