From 17ea21314d3bf8a5415034e8cd5ef68307b200b6 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Mon, 13 Oct 2025 15:13:38 +0800
Subject: [PATCH] =?UTF-8?q?10-13-=E4=BD=86=E5=9C=B0=E5=8C=BA=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96=EF=BC=88=E5=8A=A0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/domain/vo/coin/WorkbenchMarketGraph.java        |  6 ++++++
 .../com/example/demo/mapper/coin/WorkBenchMapper.java    |  4 ++--
 .../demo/serviceImpl/coin/WorkbenchServiceImpl.java      |  6 +++---
 src/main/resources/mapper/WorkBenchMapper.xml            | 16 ++++++++++------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/coin/WorkbenchMarketGraph.java b/src/main/java/com/example/demo/domain/vo/coin/WorkbenchMarketGraph.java
index 26bda9b..3d36dd9 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/WorkbenchMarketGraph.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/WorkbenchMarketGraph.java
@@ -1,10 +1,12 @@
 package com.example.demo.domain.vo.coin;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @program: gold-java
@@ -27,4 +29,8 @@ public class WorkbenchMarketGraph implements Serializable {
     private Integer SumConsumeFree; //合计消费免费金币
     private Integer SumConsumeTask; //合计消费任务金币
     private Integer SumConsume; //合计消费金币
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
+    private Date currentDate;
+    @JsonFormat(pattern = "yyyy-MM", timezone = "Asia/Shanghai")
+    private Date currentMonth;
 }
diff --git a/src/main/java/com/example/demo/mapper/coin/WorkBenchMapper.java b/src/main/java/com/example/demo/mapper/coin/WorkBenchMapper.java
index 9e7380a..5b96395 100644
--- a/src/main/java/com/example/demo/mapper/coin/WorkBenchMapper.java
+++ b/src/main/java/com/example/demo/mapper/coin/WorkBenchMapper.java
@@ -47,8 +47,8 @@ public interface WorkBenchMapper {
                                                                 @Param("endDate") Date endDate);
     //获取单个地区图表数据（40天以内，按天）
     List<WorkbenchMarketGraph> getDayStatistics(@Param("market") String market,
-                                                @Param("startDate") Date startDate,
-                                                @Param("endDate") Date endDate);
+                                                @Param("startDate") LocalDate startDate,
+                                                @Param("endDate") LocalDate endDate);
     //获取单个地区图表数据（40天以上，按月，首尾截断）
     List<WorkbenchMarketGraph> getMonthStatistics(@Param("market") String market,
                                                          @Param("startDate") LocalDate  startDate,
diff --git a/src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java
index c55efde..c7effde 100644
--- a/src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java
@@ -384,11 +384,11 @@ public class WorkbenchServiceImpl implements WorkbenchService {
      // 判断是否需要按周或按月显示 大于40天按月，反之按天
         boolean byMonth = days > 40;
 
-        if (byMonth) {
+        if (byMonth) {//按月
             List<WorkbenchMarketGraph> list = workBenchMapper.getMonthStatistics(market, start, end);
             return new WorkbenchCard(new ArrayList<>(), list, markets, startDate, endDate, 0, 0, new Date());
-        } else {
-            List<WorkbenchMarketGraph> list = workBenchMapper.getDayStatistics(market, startDate, endDate);
+        } else {//按天
+            List<WorkbenchMarketGraph> list = workBenchMapper.getDayStatistics(market, start, end);
             return new WorkbenchCard(new ArrayList<>(), list, markets, startDate, endDate, 0, 0, new Date());
         }
     }
diff --git a/src/main/resources/mapper/WorkBenchMapper.xml b/src/main/resources/mapper/WorkBenchMapper.xml
index 9e61007..daf9f6b 100644
--- a/src/main/resources/mapper/WorkBenchMapper.xml
+++ b/src/main/resources/mapper/WorkBenchMapper.xml
@@ -141,12 +141,14 @@
         select market,recharge as sumRechargePermanent,money as sumMoney,
                (recharge - money) as sumRechargeFree,
                consume_permanent as sumConsumePermanent,
-               sum(consume_free_june + consume_free_december) as sumConsumeFree,
+               (consume_free_june + consume_free_december) as sumConsumeFree,
                consume_task as sumConsumeTask,
-               current_datetime
+               current_datetime as currentDate
         from statistics where market=#{market}
-        and current_datetime between #{startDate} and #{endDate}
-        order by current_datetime
+        and  DATE(current_datetime) >= #{startDate}
+        AND  DATE(current_datetime) &lt;  #{endDate}
+        order by current_datetime desc
+
     </select>
     <!--40天以上单个地区的图表数据  按月 首尾截断-->
     <select id="getMonthStatistics" resultType="com.example.demo.domain.vo.coin.WorkbenchMarketGraph">
@@ -157,10 +159,12 @@
            sum(recharge - money) as sumRechargeFree,
            sum(consume_permanent)                 as sumConsumePermanent,
            sum(consume_free_june + consume_free_december) as sumConsumeFree,
-           sum(consume_task)                      as sumConsumeTask
+           sum(consume_task)                      as sumConsumeTask,
+        current_datetime as currentMonth
         from   statistics
         where  market = #{market}
-          and  current_datetime between #{startDate} and #{endDate}
+          and  current_datetime >= #{startDate}
+          and current_datetime &lt;  #{endDate}
         group by month
         order by month
     </select>