12.17 活动修改时间

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;

src/main/java/com/example/demo/mapper/ActivityMapper.java

@@ -63,6 +63,7 @@ public interface ActivityMapper {
             "AND activity.activity_id = #{activityId}",
             "</if>",
             "</where>",
+            "ORDER BY activity.create_time DESC,activity.start_time DESC",
             "</script>"
     })
     List<Activity> select(Activity activity);

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) +",

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;
 
 
     }