孔村大屏接口返参调整 注释调整

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;
     /**
      * 群主名称
      */

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

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<GroupTopicShiftIssueRatioRankResultDTO> selectGroupTopicShiftIssueRatioRankList(GroupTopicShiftIssueRatioRankFormDTO formDTO);

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<GroupTopicShiftIssueRatioRankResultDTO> groupTopicShiftIssueRatioRank(GroupTopicShiftIssueRatioRankFormDTO formDTO);

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<GroupUserCountRankResultDTO> groupUserCountRank(GroupUserCountRankFormDTO formDTO) {
         int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
         formDTO.setPageNo(pageIndex);
-        //按客户查询最近一天所有网格数据 再按社群总数降序排列
+        //按客户查询最近一天所有网格数据 再按照群内成员数降序
         List<GroupUserCountRankResultDTO> list = screenKcGroupDetailGridDailyDao.selectGroupUserCountRankList(formDTO);
         return list;
     }
 
     /**
      *  @param formDTO
-     * @Description  邻里党群-话题数量排名
+     * @Description  邻里党群-话题转化率排名
      * @author sun
      */
     @Override
     public List<GroupTopicShiftIssueRatioRankResultDTO> groupTopicShiftIssueRatioRank(GroupTopicShiftIssueRatioRankFormDTO formDTO) {
         int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
         formDTO.setPageNo(pageIndex);
-        //按客户查询最近一天所有网格数据 再按话题总数降序排列
+        //按客户查询最近一天所有网格数据 再按转议题数量降序排列
         List<GroupTopicShiftIssueRatioRankResultDTO> list = screenKcGroupDetailGridDailyDao.selectGroupTopicShiftIssueRatioRankList(formDTO);
         return list;
     }

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupDetailGridDailyDao.xml

@@ -5,8 +5,8 @@
 
     <select id="selectGroupUserCountRankList" resultType="com.epmet.evaluationindex.screen.dto.result.GroupUserCountRankResultDTO">
         SELECT
-            grid_id AS "groupId",
+            group_id AS "groupId",
-            grid_name AS "groupName",
+            group_name AS "groupName",
             member_count AS "memberCount",
             group_leader AS "groupLeader"
         FROM
@@ -33,10 +33,10 @@
     </select>
 
     <select id="selectGroupTopicShiftIssueRatioRankList" resultType="com.epmet.evaluationindex.screen.dto.result.GroupTopicShiftIssueRatioRankResultDTO">
-SELECT
+        SELECT
-            grid_id AS "groupId",
+            group_id AS "groupId",
-            grid_name AS "groupName",
+            group_name AS "groupName",
-            topic_count AS "topicCount",
+            shifit_issue_count AS "shifitIssueCount",
             group_leader AS "groupLeader"
         FROM
             screen_kc_group_detail_grid_daily
@@ -57,7 +57,7 @@ SELECT
             limit 1
         )
         ORDER BY
-            member_count DESC
+            shifit_issue_count DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>