From a1c121afe363f3f027cf2cd8f396494c0319e412 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 21 Sep 2020 09:58:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=94=E6=9D=91=E5=A4=A7=E5=B1=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=8F=82=E8=B0=83=E6=95=B4=20=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GroupTopicShiftIssueRatioRankResultDTO.java | 4 ++-- .../controller/screen/KcScreenController.java | 2 +- .../screenkc/ScreenKcGroupDetailGridDailyDao.java | 2 +- .../evaluationindex/screen/KcScreenService.java | 2 +- .../screen/impl/KcScreenServiceImpl.java | 6 +++--- .../screenkc/ScreenKcGroupDetailGridDailyDao.xml | 14 +++++++------- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GroupTopicShiftIssueRatioRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GroupTopicShiftIssueRatioRankResultDTO.java index d1068120bf..e4677c0e5d 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GroupTopicShiftIssueRatioRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GroupTopicShiftIssueRatioRankResultDTO.java @@ -22,9 +22,9 @@ public class GroupTopicShiftIssueRatioRankResultDTO implements Serializable { */ private String groupName = ""; /** - * 话题数量 + * 转为议题的话题数 */ - private Integer topicCount = 0; + private Integer shifitIssueCount = 0; /** * 群主名称 */ diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java index db794ca26b..210c950e78 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java @@ -210,7 +210,7 @@ public class KcScreenController { /** * @param externalAppRequestParam - * @Description 邻里党群-话题数量排名 + * @Description 邻里党群-话题转化率排名 * @author sun */ @ExternalAppRequestAuth diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupDetailGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupDetailGridDailyDao.java index 23e6e5afbd..834a64c0ee 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupDetailGridDailyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupDetailGridDailyDao.java @@ -43,7 +43,7 @@ public interface ScreenKcGroupDetailGridDailyDao { /** * @param formDTO - * @Description 按客户查询最近一天所有网格数据 再按话题总数降序排列 + * @Description 按客户查询最近一天所有网格数据 再按转议题数量降序排列 * @author sun */ List selectGroupTopicShiftIssueRatioRankList(GroupTopicShiftIssueRatioRankFormDTO formDTO); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java index f40e8517ae..d17df56ba1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java @@ -96,7 +96,7 @@ public interface KcScreenService { /** * @param formDTO - * @Description 邻里党群-话题数量排名 + * @Description 邻里党群-话题转化率排名 * @author sun */ List groupTopicShiftIssueRatioRank(GroupTopicShiftIssueRatioRankFormDTO formDTO); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java index 661a43306a..b82d6b654f 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java @@ -300,21 +300,21 @@ public class KcScreenServiceImpl implements KcScreenService { public List groupUserCountRank(GroupUserCountRankFormDTO formDTO) { int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); formDTO.setPageNo(pageIndex); - //按客户查询最近一天所有网格数据 再按社群总数降序排列 + //按客户查询最近一天所有网格数据 再按照群内成员数降序 List list = screenKcGroupDetailGridDailyDao.selectGroupUserCountRankList(formDTO); return list; } /** * @param formDTO - * @Description 邻里党群-话题数量排名 + * @Description 邻里党群-话题转化率排名 * @author sun */ @Override public List groupTopicShiftIssueRatioRank(GroupTopicShiftIssueRatioRankFormDTO formDTO) { int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); formDTO.setPageNo(pageIndex); - //按客户查询最近一天所有网格数据 再按话题总数降序排列 + //按客户查询最近一天所有网格数据 再按转议题数量降序排列 List list = screenKcGroupDetailGridDailyDao.selectGroupTopicShiftIssueRatioRankList(formDTO); return list; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupDetailGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupDetailGridDailyDao.xml index c0d3133d95..76db75d09f 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupDetailGridDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupDetailGridDailyDao.xml @@ -5,8 +5,8 @@