From 3153e8f795f92e491dd78683bfba34fb9663af00 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Fri, 11 Jul 2025 15:07:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/controller/AuditController.java    |  2 +-
 .../com/example/demo/controller/WorkbenchController.java     |  1 +
 src/main/java/com/example/demo/mapper/StatisticsMapper.java  |  1 +
 .../com/example/demo/serviceImpl/StatisticsServiceImpl.java  |  2 ++
 src/main/resources/mapper/StatisticsMapper.xml               | 12 ++++++++----
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/AuditController.java b/src/main/java/com/example/demo/controller/AuditController.java
index 349df97..4506952 100644
--- a/src/main/java/com/example/demo/controller/AuditController.java
+++ b/src/main/java/com/example/demo/controller/AuditController.java
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/audit")
 @RequiredArgsConstructor
 @Slf4j
-@Transactional
+
 @CrossOrigin
 public class AuditController {
 
diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/WorkbenchController.java
index 5d02ba9..93778f9 100644
--- a/src/main/java/com/example/demo/controller/WorkbenchController.java
+++ b/src/main/java/com/example/demo/controller/WorkbenchController.java
@@ -61,6 +61,7 @@ public class WorkbenchController {
     public ResponseEntity<WorkbenchCard> updateCard(@RequestBody WorkbenchCard workbench){
         statisticsService.runHourlyTaskPart1(); //更新余量数据
         statisticsService.runHourlyTaskPart2(); //更新余量外数据
+
         WorkbenchCard result =workbenchService.getCard();   //获取卡片数据
         return ResponseEntity.ok(result);
     }
diff --git a/src/main/java/com/example/demo/mapper/StatisticsMapper.java b/src/main/java/com/example/demo/mapper/StatisticsMapper.java
index d54f350..c684fc1 100644
--- a/src/main/java/com/example/demo/mapper/StatisticsMapper.java
+++ b/src/main/java/com/example/demo/mapper/StatisticsMapper.java
@@ -59,4 +59,5 @@ public interface StatisticsMapper {
     Statistics selectSumByMarketAndDate(@Param("market") String market,
                                      @Param("startDate") Date startDate,
                                      @Param("endDate") Date endDate);
+
 }
diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
index 0cc29bd..47222e8 100644
--- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
@@ -141,6 +141,8 @@ public class StatisticsServiceImpl implements StatisticsService {
         if (!isSameStatisticsPart2(existStats,newStats)){
             statisticsMapper.updatePart2(newStats);
         }else{
+         //   existStats.setUpdateTime(date);
+          //  statisticsMapper.updatePart2(existStats);
             System.out.println("数据未发生改变");
         }
     }
diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index 99398d7..5b2cee6 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -53,6 +53,9 @@
             refund_task = #{refundTask},
             recharge_num = #{rechargeNum},
             first_recharge = #{firstRecharge}
+        <if test="updateTime != null">
+            ,update_time = #{updateTime}
+        </if>
         WHERE market = #{market} and current_datetime = #{currentDatetime}
     </update>
     <!--更新part1统计数据-->
@@ -67,6 +70,7 @@
             current_task = #{currentTask}
         WHERE market = #{market} and current_datetime = #{currentDatetime}
     </update>
+
     <!--根据地区、审核状态、起止时间查询订单表数据-->
     <select id="findByMarketAndAuditStatus"
             resultType="com.example.demo.domain.entity.UserGoldRecord">
@@ -110,22 +114,22 @@
 
     </select>
     <select id="sumCurrentPermanentGold" resultType="java.lang.Integer">
-        SELECT SUM(user.current_permanent_gold)
+        SELECT COALESCE(SUM(current_permanent_gold), 0)
         FROM user
         WHERE user.market = #{market}
     </select>
     <select id="sumCurrentFreeJune" resultType="java.lang.Integer">
-        SELECT SUM(u.current_free_june)
+        SELECT COALESCE(SUM(u.current_free_june),0)
         FROM user as u
         WHERE u.market = #{market}
     </select>
     <select id="sumCurrentFreeDecember" resultType="java.lang.Integer">
-        SELECT SUM(u.current_free_december)
+        SELECT COALESCE(SUM(u.current_free_december),0)
         FROM user as u
         WHERE u.market = #{market}
     </select>
     <select id="sumCurrentTaskGold" resultType="java.lang.Integer">
-        SELECT SUM(u.current_task_gold)
+        SELECT COALESCE(SUM(u.current_task_gold),0)
         FROM user as u
         WHERE u.market = #{market}
     </select>