From 1e254a596faf858e8959e074cfa37b3cc6f6f97c Mon Sep 17 00:00:00 2001 From: lv123 Date: Tue, 17 Dec 2024 13:48:13 +0800 Subject: [PATCH] =?UTF-8?q?12.17=20=20=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/entity/Activity.java | 7 +++++-- src/main/java/com/example/demo/mapper/ActivityMapper.java | 1 + src/main/java/com/example/demo/mapper/StatisticsMapper.java | 2 +- .../java/com/example/demo/serviceImpl/StatisticsServiceImpl.java | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/demo/domain/entity/Activity.java b/src/main/java/com/example/demo/domain/entity/Activity.java index 250af7f..3298127 100644 --- a/src/main/java/com/example/demo/domain/entity/Activity.java +++ b/src/main/java/com/example/demo/domain/entity/Activity.java @@ -22,16 +22,19 @@ public class Activity implements Serializable { private Integer adminId; private String dept; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startTime; - + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endTime; private String activityName; private BigDecimal rechargeRatio; - + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; private Integer activityFlag; diff --git a/src/main/java/com/example/demo/mapper/ActivityMapper.java b/src/main/java/com/example/demo/mapper/ActivityMapper.java index 0db5165..ad13af0 100644 --- a/src/main/java/com/example/demo/mapper/ActivityMapper.java +++ b/src/main/java/com/example/demo/mapper/ActivityMapper.java @@ -63,6 +63,7 @@ public interface ActivityMapper { "AND activity.activity_id = #{activityId}", "", "", + "ORDER BY activity.create_time DESC,activity.start_time DESC", "" }) List select(Activity activity); diff --git a/src/main/java/com/example/demo/mapper/StatisticsMapper.java b/src/main/java/com/example/demo/mapper/StatisticsMapper.java index 4714980..d94b3c8 100644 --- a/src/main/java/com/example/demo/mapper/StatisticsMapper.java +++ b/src/main/java/com/example/demo/mapper/StatisticsMapper.java @@ -617,7 +617,7 @@ public interface StatisticsMapper { "SELECT ad.area,", " ad.store,", " SUM(CASE WHEN d.update_type = '消费' THEN d.recharge_coin ELSE 0 END) AS rechargeSumCoin,", - " SUM(CASE WHEN d.update_type sddfergrfdfbdgrhyrrhtgetre dfdtgEGTwqcdefwerbtgrytyrh = '消费' THEN d.free_coin ELSE 0 END) AS freeSumCoin,", + " SUM(CASE WHEN d.update_type = '消费' THEN d.free_coin ELSE 0 END) AS freeSumCoin,", " SUM(CASE WHEN d.update_type = '消费' THEN d.task_coin ELSE 0 END) AS taskSumCoin,", " (SUM(CASE WHEN d.update_type = '消费' THEN d.recharge_coin ELSE 0 END) +", " SUM(CASE WHEN d.update_type = '消费' THEN d.free_coin ELSE 0 END) +", diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java index 21c2f7d..516ad21 100644 --- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java @@ -162,7 +162,8 @@ public class StatisticsServiceImpl implements StatisticsService { return statisticsMapper.getPay(meium.getSearchStartTime(),meium.getSearchEndTime()); } - } else{ return null;} + } else + return null; }