From 218677d5b763d9cc4b3d9a2e37e567c508005041 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 16 May 2025 13:27:44 +0800 Subject: [PATCH] =?UTF-8?q?5=E6=9C=8816=E6=97=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/entity/Audit.java | 3 +++ src/main/java/com/example/demo/domain/entity/Detail.java | 3 +++ src/main/java/com/example/demo/domain/vo/RechargeVo.java | 3 +++ src/main/resources/mapper/RechargeMapper.xml | 1 + src/main/resources/mapper/RefundMapper.xml | 3 ++- 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/domain/entity/Audit.java b/src/main/java/com/example/demo/domain/entity/Audit.java index 9a64c4a..b4eaf39 100644 --- a/src/main/java/com/example/demo/domain/entity/Audit.java +++ b/src/main/java/com/example/demo/domain/entity/Audit.java @@ -26,6 +26,9 @@ public class Audit implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date auditTime; private Date startDate; private Date endDate; private String reson; diff --git a/src/main/java/com/example/demo/domain/entity/Detail.java b/src/main/java/com/example/demo/domain/entity/Detail.java index 5c35695..79d030f 100644 --- a/src/main/java/com/example/demo/domain/entity/Detail.java +++ b/src/main/java/com/example/demo/domain/entity/Detail.java @@ -40,6 +40,9 @@ public class Detail implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date auditTime; private String username; private Date endDate; private Date startDate; diff --git a/src/main/java/com/example/demo/domain/vo/RechargeVo.java b/src/main/java/com/example/demo/domain/vo/RechargeVo.java index 62482e5..787403a 100644 --- a/src/main/java/com/example/demo/domain/vo/RechargeVo.java +++ b/src/main/java/com/example/demo/domain/vo/RechargeVo.java @@ -35,6 +35,9 @@ public class RechargeVo implements Serializable { // 实现 Serializable 接口 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date auditTime; private Date startDate; private Date endDate; private String username; diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml index b435090..19ec4af 100644 --- a/src/main/resources/mapper/RechargeMapper.xml +++ b/src/main/resources/mapper/RechargeMapper.xml @@ -72,6 +72,7 @@ activity.activity_name, audit.`status`, audit.audit_id, + audit.audit_time, audit.reson, admin.name, user.area, diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index f84d14e..3aa0adb 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -63,7 +63,8 @@ au.status, au.reson AS auditReson, au.refund_id, - au.audit_id + au.audit_id, + au.audit_time FROM detail d LEFT JOIN `admin` a ON d.admin_id = a.admin_id LEFT JOIN `user` u ON d.jwcode = u.jwcode