From 74b8bfb55940bef6d2204781e42554954b98b1f1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 May 2021 16:01:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AD=BE=E5=88=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8C=89=E7=AD=BE=E5=88=B0=E6=97=B6=E9=97=B4=E9=99=8D?= =?UTF-8?q?=E5=BA=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/resigroup/result/GroupActRankResultDTO.java | 3 +-- .../src/main/resources/mapper/act/ActSignInRecordDao.xml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java index 8bb3ed181f..bb27ea7436 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java @@ -1,7 +1,6 @@ package com.epmet.dataaggre.dto.resigroup.result; import com.epmet.commons.tools.constant.NumConstant; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -25,7 +24,7 @@ public class GroupActRankResultDTO implements Serializable { private String participateUserName; private List categoryList; - @JsonIgnore + // @JsonIgnore private Integer sortValue; public GroupActRankResultDTO() { diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml index ec3207549b..b2cb9d1fdc 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml @@ -25,6 +25,7 @@ WHERE acr.DEL_FLAG = '0' AND acr.GROUP_ACT_ID = #{groupActId} + order by acr.CREATED_TIME desc