From 208079fd1dfac1c1aee1814a0432652463604f82 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Thu, 26 Jun 2025 10:42:22 +0800
Subject: [PATCH] =?UTF-8?q?6.26=20=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/GoldDetail.java |  2 ++
 src/main/resources/mapper/GoldDetailMapper.xml           | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/GoldDetail.java b/src/main/java/com/example/demo/domain/vo/GoldDetail.java
index bf676f7..71e67e5 100644
--- a/src/main/java/com/example/demo/domain/vo/GoldDetail.java
+++ b/src/main/java/com/example/demo/domain/vo/GoldDetail.java
@@ -36,6 +36,8 @@ public class GoldDetail {
     private Date startTime; // 开始时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date endTime;   // 结束时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date auditTime; // 更新时间
     private String sortField; //排序字段
     private String sortOrder; //排序顺序
 
diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml
index 02cfb51..4a0b901 100644
--- a/src/main/resources/mapper/GoldDetailMapper.xml
+++ b/src/main/resources/mapper/GoldDetailMapper.xml
@@ -8,13 +8,13 @@
         left join `user` on `user`.jwcode = `ugr`.jwcode
         left join `admin` on `admin`.id = `ugr`.admin_id
         <where>
-            <if test="jwcode != null and jwcode.length > 0">
+            <if test="jwcode != null">
                 and `ugr`.jwcode = #{jwcode}
             </if>
             <if test="payPlatform != null and payPlatform.length > 0">
                 and `ugr`.pay_platform = #{payPlatform}
             </if>
-            <if test="type != null and type.length > 0">
+            <if test="type != null">
                 and `ugr`.type = #{type}
             </if>
             <if test="market != null and market.length > 0">
@@ -38,13 +38,13 @@
         select sum(sum_gold) as Goldtotal, sum(permanent_gold) as permanentGold, sum(free_june+free_december) as freeGold, sum(task_gold) as taskGold
         from user_gold_record
         <where>
-            <if test="jwcode != null and jwcode.length > 0">
+            <if test="jwcode != null">
                 and `ugr`.jwcode = #{jwcode}
             </if>
             <if test="payPlatform != null and payPlatform.length > 0">
                 and `ugr`.pay_platform = #{payPlatform}
             </if>
-            <if test="type != null and type.length > 0">
+            <if test="type != null">
                 and `ugr`.type = #{type}
             </if>
             <if test="market != null and market.length > 0">
@@ -59,7 +59,7 @@
     <select id="getGold" resultType="com.example.demo.domain.entity.User">
         select * from user
         <where>
-            <if test="jwcode != null and jwcode.length > 0">
+            <if test="jwcode != null">
                 and jwcode = #{jwcode}
             </if>
             <if test="market != null and market.length > 0">
@@ -83,7 +83,7 @@
         sum(current_permanent_gold) + sum(current_free_june + current_free_december) + sum(current_task_gold) as Goldtotal
         from `user`
         <where>
-            <if test="jwcode != null and jwcode.length > 0">
+            <if test="jwcode != null">
                 and jwcode = #{jwcode}
             </if>
             <if test="market != null and market.length > 0">