From 241392bf3ba2eaf76bf2d90617381f28c099daa1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 7 Jan 2021 14:57:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=83=AD=E8=AE=AE-=E5=B7=B2?= =?UTF-8?q?=E8=BD=AC=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/govissue/impl/GovIssueServiceImpl.java | 3 +-- .../src/main/resources/mapper/govissue/IssueDao.xml | 2 +- .../src/main/resources/mapper/govproject/ProjectDao.xml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java index 3f77c42158..87ff2a6dd9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java @@ -280,8 +280,7 @@ public class GovIssueServiceImpl implements GovIssueService { shiftProject.setStatus(project.getStatus()); return shiftProject; })).collect(Collectors.toList()); - List result = resultList.stream().sorted(Comparator.comparing(ShiftProjectIssueListResultDTO::getCount, Comparator.reverseOrder()).thenComparing(ShiftProjectIssueListResultDTO::getShiftedTime, Comparator.reverseOrder())).collect(Collectors.toList()); - return result; + return resultList; } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml index 93d5b12ce0..96475ca863 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml @@ -75,7 +75,7 @@ AND i.issue_status = 'shift_project' AND i.org_id_path like concat('%', #{agencyId}, '%') ORDER BY - count DESC, i.created_time ASC + count DESC, i.shifted_time DESC LIMIT #{pageNo}, #{pageSize} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 7d3ccb3dd7..37a25a2afe 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -108,7 +108,7 @@ p.origin_id = #{issueId} ORDER BY - p.created_time ASC + p.created_time DESC