Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/CpcIndexCommonDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dto.indexcollect.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/10/12 21:57
+ */
+@Data
+public class CpcIndexCommonDTO implements Serializable {
+    private static final long serialVersionUID = -424750065699208595L;
+    private String userId;
+    private Integer indexValue;
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java

@@ -23,12 +23,12 @@ import com.epmet.dto.extract.form.IssueMainDailyFormDTO;
 import com.epmet.dto.extract.result.GridProjectCountResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.extract.result.ShiftProjectCountResultDTO;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginIssueMainDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  *  议题主表
@@ -84,14 +84,13 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
      */
     List<GridProjectCountResultDTO> selectGridProjectCount(@Param("customerId") String customerId,@Param("monthId") String monthId, @Param("status") String status);
     /**
-     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
      * @param customerId
      * @param monthId
      * @author yinzuomei
      * @description 党员提出的话题转议题数
      * @Date 2020/9/18 13:58
      **/
-    List<Map<String, Integer>> selectShiftIssueCount(@Param("customerId") String customerId,@Param("monthId") String monthId);
+    List<CpcIndexCommonDTO> selectShiftIssueCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
 
     /**
      * @Description  查询网格 党员/群众 人均提出的议题转项目数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java

@@ -19,8 +19,9 @@ package com.epmet.dao.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
-import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
+import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
@@ -28,7 +29,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 项目主表_日统计
@@ -88,14 +88,13 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	void deleteByDate(@Param("customerId") String customerId, @Param("date") String date);
 
 	/**
-	 * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
 	 * @param customerId
 	 * @param monthId
 	 * @author yinzuomei
 	 * @description 党员提出的议题转项目数
 	 * @Date 2020/9/18 14:11
 	 **/
-	List<Map<String, Integer>> selectShiftProjectCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
+	List<CpcIndexCommonDTO> selectShiftProjectCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
 
 	/**
 	 * @return java.lang.Integer

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicLogDailyDao.java

@@ -19,12 +19,12 @@ package com.epmet.dao.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.extract.result.PartyActiveResultDTO;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 话题明细_日统计
@@ -56,14 +56,13 @@ public interface FactOriginTopicLogDailyDao extends BaseDao<FactOriginTopicLogDa
     int insertBatchEntity(@Param("list") List<FactOriginTopicLogDailyEntity> list);
 
     /**
-     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
      * @param customerId
      * @param monthId
      * @author yinzuomei
      * @description 查询客户下，这个月内，每个党员评论话题的次数
      * @Date 2020/9/18 13:36
      **/
-    List<Map<String, Integer>> selectJoinTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
+    List<CpcIndexCommonDTO> selectJoinTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
 
     /**
      * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
@@ -73,7 +72,7 @@ public interface FactOriginTopicLogDailyDao extends BaseDao<FactOriginTopicLogDa
      * @description 党员自建群活跃度——话题数
      * @Date 2020/9/18 15:05
      **/
-    List<Map<String, Integer>> selectGroupTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
+    List<CpcIndexCommonDTO> selectGroupTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
 
     /**
      * @return java.lang.Integer

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java

@@ -20,12 +20,12 @@ package com.epmet.dao.evaluationindex.extract;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 话题主表_日统计
@@ -65,7 +65,7 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
      * @description 党员提出话题数：返回每个党员这个月内，提出的话题数
      * @Date 2020/9/18 11:05
      **/
-    List<Map<String, Integer>> selectPartyCreateTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
+    List<CpcIndexCommonDTO> selectPartyCreateTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
 
     /**
      * @Description  查询网格 党员/群众 人均提出话题数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.evaluationindex.extract.dataToIndex.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyEntity;
 import com.epmet.service.evaluationindex.extract.dataToIndex.CalCpcIndexService;
 import com.epmet.service.evaluationindex.extract.todata.*;
@@ -158,12 +159,10 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
      * @Date 2020/9/18 10:59
      **/
     private Map<String, Integer> calCreateTopicCount(String customerId, String monthId) {
-        List<Map<String, Integer>> mapList = factOriginTopicMainDailyService.selectPartyCreateTopicCount(customerId, monthId);
+        List<CpcIndexCommonDTO> list = factOriginTopicMainDailyService.selectPartyCreateTopicCount(customerId, monthId);
         Map<String, Integer> resultMap = new HashMap<>();
-        for (Map<String, Integer> map : mapList) {
+        for (CpcIndexCommonDTO cpcIndexCommonDTO: list) {
-            for (Map.Entry<String, Integer> m : map.entrySet()) {
+                resultMap.put(cpcIndexCommonDTO.getUserId(), cpcIndexCommonDTO.getIndexValue());
-                resultMap.put(m.getKey(), m.getValue());
-            }
         }
         return resultMap;
     }
@@ -177,12 +176,10 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
      * @Date 2020/9/18 13:33
      **/
     private Map<String, Integer> calJoinTopicCount(String customerId, String monthId) {
-        List<Map<String, Integer>> mapList = factOriginTopicLogDailyService.selectJoinTopicCount(customerId, monthId);
+        List<CpcIndexCommonDTO> list = factOriginTopicLogDailyService.selectJoinTopicCount(customerId, monthId);
         Map<String, Integer> resultMap = new HashMap<>();
-        for (Map<String, Integer> map : mapList) {
+        for (CpcIndexCommonDTO cpcIndexCommonDTO : list) {
-            for (Map.Entry<String, Integer> m : map.entrySet()) {
+            resultMap.put(cpcIndexCommonDTO.getUserId(), cpcIndexCommonDTO.getIndexValue());
-                resultMap.put(m.getKey(), m.getValue());
-            }
         }
         return resultMap;
     }
@@ -197,12 +194,10 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
      * @Date 2020/9/18 13:53
      **/
     private Map<String, Integer> calShiftIssueCount(String customerId, String monthId) {
-        List<Map<String, Integer>> mapList = issueExtractService.selectShiftIssueCount(customerId, monthId);
+        List<CpcIndexCommonDTO> list = issueExtractService.selectShiftIssueCount(customerId, monthId);
         Map<String, Integer> resultMap = new HashMap<>();
-        for (Map<String, Integer> map : mapList) {
+        for (CpcIndexCommonDTO cpcIndexCommonDTO : list) {
-            for (Map.Entry<String, Integer> m : map.entrySet()) {
+            resultMap.put(cpcIndexCommonDTO.getUserId(), cpcIndexCommonDTO.getIndexValue());
-                resultMap.put(m.getKey(), m.getValue());
-            }
         }
         return resultMap;
     }
@@ -217,12 +212,10 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
      **/
     private Map<String, Integer> calShiftProjectCount(String customerId, String monthId) {
         //查询fact_origin_project_main_daily 表 中议题的议题的状态为 shift_
-        List<Map<String, Integer>> mapList = factOriginProjectMainDailyService.selectShiftProjectCount(customerId, monthId);
+        List<CpcIndexCommonDTO> list = factOriginProjectMainDailyService.selectShiftProjectCount(customerId, monthId);
         Map<String, Integer> resultMap = new HashMap<>();
-        for (Map<String, Integer> map : mapList) {
+        for (CpcIndexCommonDTO cpcIndexCommonDTO : list) {
-            for (Map.Entry<String, Integer> m : map.entrySet()) {
+            resultMap.put(cpcIndexCommonDTO.getUserId(), cpcIndexCommonDTO.getIndexValue());
-                resultMap.put(m.getKey(), m.getValue());
-            }
         }
         return resultMap;
     }
@@ -337,12 +330,10 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
         数据来源：话题表。
         计算方法：从话题表中统计党员自建群i的话题总数；对所有自建群话题数累加。
         对评价结果的影响：正向。*/
-        List<Map<String, Integer>> mapList = factOriginTopicLogDailyService.selectGroupTopicCount(customerId, monthId);
+        List<CpcIndexCommonDTO> list = factOriginTopicLogDailyService.selectGroupTopicCount(customerId, monthId);
         Map<String, Integer> resultMap = new HashMap<>();
-        for (Map<String, Integer> map : mapList) {
+        for (CpcIndexCommonDTO dto : list) {
-            for (Map.Entry<String, Integer> m : map.entrySet()) {
+            resultMap.put(dto.getUserId(), dto.getIndexValue());
-                resultMap.put(m.getKey(), m.getValue());
-            }
         }
         return resultMap;
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java

@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
 import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
@@ -146,14 +147,13 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
     void deleteByDate(String customerId, String date);
 
     /**
-     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
      * @param customerId
      * @param monthId
      * @author yinzuomei
      * @description 党员提出的议题转项目数
      * @Date 2020/9/18 14:11
      **/
-    List<Map<String, Integer>> selectShiftProjectCount(String customerId, String monthId);
+    List<CpcIndexCommonDTO> selectShiftProjectCount(String customerId, String monthId);
 
     /**
      * @return java.lang.Integer

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicLogDailyService.java

@@ -18,12 +18,11 @@
 package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.extract.result.PartyActiveResultDTO;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 话题明细_日统计
@@ -34,24 +33,22 @@ import java.util.Map;
 public interface FactOriginTopicLogDailyService extends BaseService<FactOriginTopicLogDailyEntity> {
 
     /**
-     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
      * @param customerId
      * @param monthId
      * @author yinzuomei
      * @description 查询客户下，这个月内，每个党员评论话题的次数
      * @Date 2020/9/18 13:35
      **/
-    List<Map<String, Integer>> selectJoinTopicCount(String customerId, String monthId);
+    List<CpcIndexCommonDTO> selectJoinTopicCount(String customerId, String monthId);
 
     /**
-     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
      * @param customerId
      * @param monthId
      * @author yinzuomei
      * @description 党员自建群活跃度——话题数
      * @Date 2020/9/18 14:33
      **/
-    List<Map<String, Integer>> selectGroupTopicCount(String customerId, String monthId);
+    List<CpcIndexCommonDTO> selectGroupTopicCount(String customerId, String monthId);
 
     /**
      * @return int

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java

@@ -21,10 +21,10 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
 
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -44,14 +44,13 @@ public interface FactOriginTopicMainDailyService extends BaseService<FactOriginT
     Boolean topicCleaning(ExtractOriginFormDTO extractOriginFormDTO);
 
     /**
-     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
      * @param customerId
      * @param monthId yyyyMM
      * @author yinzuomei
      * @description 党员提出话题数：返回每个党员这个月内，提出的话题数
      * @Date 2020/9/18 11:03
      **/
-    List<Map<String, Integer>> selectPartyCreateTopicCount(String customerId, String monthId);
+    List<CpcIndexCommonDTO> selectPartyCreateTopicCount(String customerId, String monthId);
 
     /**
      * @Description  查询网格 党员/群众 人均提出话题数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/IssueExtractService.java

@@ -5,9 +5,9 @@ import com.epmet.dto.extract.form.GridIssueCountResultDTO;
 import com.epmet.dto.extract.result.GridProjectCountResultDTO;
 import com.epmet.dto.extract.result.PartyActiveResultDTO;
 import com.epmet.dto.extract.result.ShiftProjectCountResultDTO;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Author zxc
@@ -60,14 +60,13 @@ public interface IssueExtractService {
     List<GridProjectCountResultDTO> selectGridProjectCount(String customerId, String monthId,String status);
 
     /**
-     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
      * @param customerId
      * @param monthId
      * @author yinzuomei
      * @description 党员提出的话题转议题数
      * @Date 2020/9/18 13:57
      **/
-    List<Map<String, Integer>> selectShiftIssueCount(String customerId, String monthId);
+    List<CpcIndexCommonDTO> selectShiftIssueCount(String customerId, String monthId);
 
     /**
      * @Description  查询网格 党员/群众 人均提出的议题转项目数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java

@@ -30,6 +30,7 @@ import com.epmet.dao.evaluationindex.extract.FactOriginProjectMainDailyDao;
 import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
 import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
@@ -141,13 +142,12 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
     /**
      * @param customerId
      * @param monthId
-     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Integer>>
      * @author yinzuomei
      * @description 党员提出的议题转项目数
      * @Date 2020/9/18 14:11
      **/
     @Override
-    public List<Map<String, Integer>> selectShiftProjectCount(String customerId, String monthId) {
+    public List<CpcIndexCommonDTO> selectShiftProjectCount(String customerId, String monthId) {
         //查询项目主表fact_origin_project_main_daily，这个月内新增的项目，按话题发布人分组
         /*含义：评价周期内，党员提出的议题转数目数。
         数据来源：项目表。

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicLogDailyServiceImpl.java

@@ -22,6 +22,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao;
 import com.epmet.dto.extract.result.PartyActiveResultDTO;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicLogDailyService;
 import org.springframework.stereotype.Service;
@@ -29,7 +30,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 话题明细_日统计
@@ -45,13 +45,12 @@ public class FactOriginTopicLogDailyServiceImpl extends BaseServiceImpl<FactOrig
     /**
      * @param customerId
      * @param monthId
-     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Integer>>
      * @author yinzuomei
      * @description 查询客户下，这个月内，每个党员评论话题的次数
      * @Date 2020/9/18 13:35
      **/
     @Override
-    public List<Map<String, Integer>> selectJoinTopicCount(String customerId, String monthId) {
+    public List<CpcIndexCommonDTO> selectJoinTopicCount(String customerId, String monthId) {
         //这个月内新增的话题评论，按人分组，不限制评论时的身份，以当前用户最新身份为准
         return baseDao.selectJoinTopicCount(customerId,monthId);
     }
@@ -59,13 +58,12 @@ public class FactOriginTopicLogDailyServiceImpl extends BaseServiceImpl<FactOrig
     /**
      * @param customerId
      * @param monthId
-     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Integer>>
      * @author yinzuomei
      * @description 党员自建群活跃度——话题数
      * @Date 2020/9/18 14:33
      **/
     @Override
-    public List<Map<String, Integer>> selectGroupTopicCount(String customerId, String monthId) {
+    public List<CpcIndexCommonDTO> selectGroupTopicCount(String customerId, String monthId) {
         return baseDao.selectGroupTopicCount(customerId,monthId);
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java

@@ -31,6 +31,7 @@ import com.epmet.dao.evaluationindex.extract.FactOriginTopicMainDailyDao;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
@@ -258,7 +259,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
      * @Date 2020/9/18 11:03
      **/
     @Override
-    public List<Map<String, Integer>> selectPartyCreateTopicCount(String customerId, String monthId) {
+    public List<CpcIndexCommonDTO> selectPartyCreateTopicCount(String customerId, String monthId) {
         //这个月内新增的话题，按人分组，不限制发话题人的身份，也就是说以用户最新的身份为准
         return baseDao.selectPartyCreateTopicCount(customerId,monthId);
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/IssueExtractServiceImpl.java

@@ -16,6 +16,7 @@ import com.epmet.dto.extract.form.GridIssueCountResultDTO;
 import com.epmet.dto.extract.form.IssueLogDailyFormDTO;
 import com.epmet.dto.extract.form.IssueMainDailyFormDTO;
 import com.epmet.dto.extract.result.*;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.service.Issue.IssueService;
 import com.epmet.service.evaluationindex.extract.todata.IssueExtractService;
 import com.epmet.service.topic.TopicService;
@@ -293,14 +294,13 @@ public class IssueExtractServiceImpl implements IssueExtractService {
     /**
      * @param customerId
      * @param monthId
-     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Integer>>
      * @author yinzuomei
      * @description 党员提出的话题转议题数
      * @Date 2020/9/18 13:57
      **/
     @DataSource(DataSourceConstant.STATS)
     @Override
-    public List<Map<String, Integer>> selectShiftIssueCount(String customerId, String monthId) {
+    public List<CpcIndexCommonDTO> selectShiftIssueCount(String customerId, String monthId) {
         //查询fact_origin_issue_main_daily 表，转议题的时间在评价周期内的，按发布话题的人分组
         /*含义：评价周期内，党员提出的话题转为议题的数目。
         数据来源：议题表。

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml

@@ -111,10 +111,10 @@
     </select>
 
     <!--   党员提出的话题转议题数 -->
-    <select id="selectShiftIssueCount" parameterType="map"  resultType="java.util.Map">
+    <select id="selectShiftIssueCount" parameterType="map"  resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
         SELECT
-            t1.CREATE_TOPIC_USER_ID AS USER_ID,
+            t1.CREATE_TOPIC_USER_ID AS userId,
-            COUNT( 1 ) AS SHIFT_ISSUE_COUNT
+            COUNT( 1 ) AS indexValue
         FROM
             fact_origin_issue_main_daily t1
         WHERE

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

@@ -113,10 +113,10 @@
     </delete>
 
     <!--  党员提出的议题转项目数  -->
-    <select id="selectShiftProjectCount" parameterType="map"  resultType="java.util.Map">
+    <select id="selectShiftProjectCount" parameterType="map"  resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
         SELECT
-                t1.TOPIC_CREATOR_ID AS USER_ID,
+                t1.TOPIC_CREATOR_ID AS userId,
-                COUNT( 1 ) AS SHIFT_PROJECT_COUNT
+                COUNT( 1 ) AS indexValue
         FROM
                 fact_origin_project_main_daily t1
         WHERE

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicLogDailyDao.xml

@@ -69,10 +69,10 @@
     </insert>
 
     <!--  查询客户下，这个月内，每个党员评论话题的次数  -->
-    <select id="selectJoinTopicCount" parameterType="map"  resultType="java.util.Map">
+    <select id="selectJoinTopicCount" parameterType="map"  resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
         SELECT
-            t1.OPERATE_USER_ID,
+            t1.OPERATE_USER_ID as userId,
-            count( 1 ) AS JOIN_TOPIC_COUNT
+            count( 1 ) AS indexValue
         FROM
             fact_origin_topic_log_daily t1
         WHERE
@@ -85,9 +85,9 @@
     </select>
 
     <!-- 党员自建群活跃度——话题数 -->
-    <select id="selectGroupTopicCount" parameterType="map"  resultType="java.util.Map">
+    <select id="selectGroupTopicCount" parameterType="map"  resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
-        select T2.USER_ID,
+        select T2.USER_ID as userId,
-        COUNT(1) AS GROUP_TOPIC_COUNT
+        COUNT(1) AS indexValue
         from fact_origin_topic_main_daily t1
         INNER JOIN (
             select main.GROUP_OWNER_ID AS USER_ID,main.ID AS GROUP_ID

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml

@@ -68,10 +68,10 @@
     </insert>
 
     <!--  党员提出话题数：返回每个党员这个月内，提出的话题数  -->
-    <select id="selectPartyCreateTopicCount" parameterType="map" resultType="java.util.Map">
+    <select id="selectPartyCreateTopicCount" parameterType="map" resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
         SELECT
-            T1.CREATE_TOPIC_USER_ID AS USER_ID,
+            T1.CREATE_TOPIC_USER_ID AS userId,
-            COUNT( 1 ) AS CREATE_TOPIC_COUNT
+            COUNT( 1 ) AS indexValue
         FROM
             fact_origin_topic_main_daily t1
         WHERE