From e82e2a677af874e972beaee6156d60df3de3e88f Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Mon, 7 Apr 2025 11:30:02 +0800
Subject: [PATCH] =?UTF-8?q?4.7=20=E9=87=91=E5=B8=81=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/domain/entity/UserDetailExport.java |  4 ++--
 src/main/resources/mapper/DetailYMapper.xml                   | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/entity/UserDetailExport.java b/src/main/java/com/example/demo/domain/entity/UserDetailExport.java
index 8910895..cf8c5e9 100644
--- a/src/main/java/com/example/demo/domain/entity/UserDetailExport.java
+++ b/src/main/java/com/example/demo/domain/entity/UserDetailExport.java
@@ -27,10 +27,10 @@ public class UserDetailExport {
     private String area;
     @ExcelProperty("平台信息")
     @ColumnWidth(20)
-    private String platformInfo;
+    private String consumePlatform;
     @ExcelProperty("更新数量")
     @ColumnWidth(20)
-    private BigDecimal count;
+    private BigDecimal gold;
     @ExcelProperty("更新类型")
     @ColumnWidth(20)
     private Integer updateType;
diff --git a/src/main/resources/mapper/DetailYMapper.xml b/src/main/resources/mapper/DetailYMapper.xml
index 246e340..ee154f2 100644
--- a/src/main/resources/mapper/DetailYMapper.xml
+++ b/src/main/resources/mapper/DetailYMapper.xml
@@ -82,10 +82,10 @@
         FROM
         detail_y
         <where>
-            <if test="num!=null">
-               and recharge_coin LIKE '-%'
+            <if test="num!=null and num.length > 0">
+                AND (recharge_coin LIKE '-%'
                 OR free_coin LIKE '-%'
-                OR task_coin LIKE '-%'
+                OR task_coin LIKE '-%')
             </if>
             <!-- 动态条件 -->
             <if test="jwcode != null and jwcode.length > 0">
@@ -247,7 +247,7 @@
             </if>
         </where>
     </select>
-    <select id="searchAll" resultType="com.example.demo.domain.vo.DetailExport">
+    <select id="searchAll" resultType="com.example.demo.domain.entity.UserDetailExport">
         SELECT
         d.detaily_id,
         u.name,
@@ -259,7 +259,8 @@
         d.task_coin,
         d.free_coin,
         d.create_admin,
-        d.create_time
+        d.create_time,
+        (d.recharge_coin+d.task_coin+d.free_coin) AS gold
         FROM
         detail_y d
         LEFT JOIN