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 - + and `ugr`.jwcode = #{jwcode} and `ugr`.pay_platform = #{payPlatform} - + and `ugr`.type = #{type} @@ -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 - + and `ugr`.jwcode = #{jwcode} and `ugr`.pay_platform = #{payPlatform} - + and `ugr`.type = #{type} @@ -59,7 +59,7 @@