党员相关-党建能力计算V0.2

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java

@@ -59,8 +59,6 @@ public class FactOriginController {
     }
 
     /**
-     * @param customerId yyyyMMdd
-     * @param dateId     yyyyMMdd
      * @return com.epmet.commons.tools.utils.Result
      * @author yinzuomei
      * @description 话题 (fact_origin_topic_main_daily	话题主表_日统计  fact_origin_topic_log_daily 话题明细_日统计)

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

@@ -24,6 +24,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  *  议题主表
@@ -50,4 +51,23 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
      * @date 2020/9/16 9:33 上午
      */
     void deleteOldMainRecord(@Param("customerId")String customerId, @Param("dateId")String dateId);
+    /**
+     * @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);
+
+    /**
+     * @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);
 }

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

@@ -23,6 +23,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 话题明细_日统计
@@ -52,4 +53,24 @@ public interface FactOriginTopicLogDailyDao extends BaseDao<FactOriginTopicLogDa
      * @Date 2020/9/16 12:54
      **/
     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);
+
+    /**
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
+     * @param customerId
+     * @param monthId
+     * @author yinzuomei
+     * @description 党员自建群活跃度——话题数
+     * @Date 2020/9/18 15:05
+     **/
+    List<Map<String, Integer>> selectGroupTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
 }

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

@@ -23,6 +23,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 话题主表_日统计
@@ -54,4 +55,13 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
      * @Date 2020/9/16 12:48
      **/
     int insertBatchEntity(@Param("list") List<FactOriginTopicMainDailyEntity> list);
+
+    /**
+     * @param customerId
+     * @param monthId
+     * @author yinzuomei
+     * @description 党员提出话题数：返回每个党员这个月内，提出的话题数
+     * @Date 2020/9/18 11:05
+     **/
+    List<Map<String, Integer>> selectPartyCreateTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
 }

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

@@ -32,4 +32,23 @@ 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);
+
+    /**
+     * @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);
 }

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

@@ -21,6 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.extract.form.ExtractFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
 
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * 话题主表_日统计
@@ -31,8 +34,6 @@ import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
 public interface FactOriginTopicMainDailyService extends BaseService<FactOriginTopicMainDailyEntity> {
 
     /**
-     * @param customerId 客户id
-     * @param dateId     yyyyMMdd
      * @return void
      * @author yinzuomei 数据采集：话题本身
      * @description fact_origin_topic_log_daily    话题明细_日统计  fact_origin_topic_main_daily	话题主表_日统计
@@ -40,5 +41,13 @@ public interface FactOriginTopicMainDailyService extends BaseService<FactOriginT
      **/
     Boolean topicCleaning(ExtractFormDTO extractFormDTO);
 
-
+    /**
+     * @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);
 }

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

@@ -2,6 +2,9 @@ package com.epmet.service.evaluationindex.extract;
 
 import com.epmet.dto.extract.form.ExtractFormDTO;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author zxc
  * @DateTime 2020/9/14 5:07 下午
@@ -23,4 +26,24 @@ public interface IssueExtractService {
      * @date 2020/9/16 9:41 上午
      */
     Boolean issueExtractLog(ExtractFormDTO extractFormDTO);
+
+    /**
+     * @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);
+
+    /**
+     * @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);
 }

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

@@ -5,16 +5,20 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyDao;
-import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyEntity;
 import com.epmet.service.evaluationindex.extract.CalCpcIndexService;
+import com.epmet.service.evaluationindex.extract.FactOriginTopicLogDailyService;
+import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService;
+import com.epmet.service.evaluationindex.extract.IssueExtractService;
 import com.epmet.service.stats.DimCustomerPartymemberService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 党员相关
@@ -29,6 +33,12 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
     private DimCustomerPartymemberService dimCustomerPartymemberService;
     @Autowired
     private FactIndexPartyAblityCpcMonthlyDao factIndexPartyAblityCpcMonthlyDao;
+    @Autowired
+    private FactOriginTopicMainDailyService factOriginTopicMainDailyService;
+    @Autowired
+    private FactOriginTopicLogDailyService factOriginTopicLogDailyService;
+    @Autowired
+    private IssueExtractService issueExtractService;
 
     /**
      * @param customerId 客户id
@@ -44,18 +54,48 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
         List<FactIndexPartyAblityCpcMonthlyEntity> indexPartyAblityCpcList = dimCustomerPartymemberService.selectPartyMemberList(customerId);
         //2、删除之前统计过的
         deleteFactIndexPartyAblityCpcMonthly(customerId, monthId);
+        //1、党员提出话题数
+        Map<String, Integer> createTopicCountMap = calCreateTopicCount(customerId, monthId);
+        //2、党员参与话题数（支持、反对、评论、浏览）---目前只统计  党员评论话题次数之和
+        Map<String,Integer> joinTopicCountMap=calJoinTopicCount(customerId,monthId);
+        //3、党员提出的话题转议题数
+        Map<String,Integer> shiftIssueCountMap=calShiftIssueCount(customerId,monthId);
+        //4、党员提出的议题转项目数
+        Map<String,Integer> shiftProjectCountMap=calShiftProjectCount(customerId,monthId);
+        //6、党员自建群群众人数
+        Map<String,Integer> groupUserCountMap=calgroupUserCount(customerId,monthId);
+        //8、党员自建群活跃度——话题数
+        Map<String,Integer> groupTopicCountMap=calGroupTopicCountMap(customerId,monthId);
         //3、计算实际值，更新
         for (FactIndexPartyAblityCpcMonthlyEntity indexPartyAblityCpcEntity : indexPartyAblityCpcList) {
-            //TODO
-            //党员提出话题数
-            //党员参与话题数（支持、反对、评论、浏览）
-            //党员提出的话题转议题数
-            //党员提出的议题转项目数
-            //参加“三会一课”次数
-            //党员自建群群众人数
-            //党员自建群活跃群众人数
-            //党员自建群活跃度——话题数
-            //自建群活跃度——议题转项目率
+            //1、党员提出话题数
+            if (createTopicCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())) {
+                indexPartyAblityCpcEntity.setCreateTopicCount(createTopicCountMap.get(indexPartyAblityCpcEntity.getUserId()));
+            }
+            //2、党员参与话题数（支持、反对、评论、浏览）---目前只统计  党员评论话题次数之和
+            if(joinTopicCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){
+                indexPartyAblityCpcEntity.setJoinTopicCount(joinTopicCountMap.get(indexPartyAblityCpcEntity.getUserId()));
+            }
+            //3、党员提出的话题转议题数
+            if(shiftIssueCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){
+                indexPartyAblityCpcEntity.setShiftIssueCount(shiftIssueCountMap.get(indexPartyAblityCpcEntity.getUserId()));
+            }
+            //4、党员提出的议题转项目数
+            if(shiftProjectCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){
+                indexPartyAblityCpcEntity.setShiftProjectCount(shiftProjectCountMap.get(indexPartyAblityCpcEntity.getUserId()));
+            }
+            //5、参加“三会一课”次数 目前没有此业务，默认0
+            //6、党员自建群群众人数 TODO
+            if(groupUserCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){
+                indexPartyAblityCpcEntity.setGroupUserCount(groupUserCountMap.get(indexPartyAblityCpcEntity.getUserId()));
+            }
+            //7、党员自建群活跃群众人数  TODO
+            //8、党员自建群活跃度——话题数
+            if(groupTopicCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){
+                indexPartyAblityCpcEntity.setGroupTopicCount(groupTopicCountMap.get(indexPartyAblityCpcEntity.getUserId()));
+            }
+            //9、自建群活跃度——议题转项目率  TODO
+
         }
         //4、分批插入
         //批量插入
@@ -63,8 +103,117 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
         partition.forEach(list -> {
             this.FactIndexPartyAblityCpcMonthlyEntity(list);
         });
+
+    }
+
+    /**
+     * @param customerId
+     * @param monthId
+     * @return java.lang.Integer
+     * @author yinzuomei
+     * @description 1、查询出客户下所有党员对应的-党员提出话题数
+     * @Date 2020/9/18 10:59
+     **/
+    private Map<String, Integer> calCreateTopicCount(String customerId, String monthId) {
+        List<Map<String, Integer>> mapList = factOriginTopicMainDailyService.selectPartyCreateTopicCount(customerId, monthId);
+        Map<String, Integer> resultMap = new HashMap<>();
+        for (Map<String, Integer> map : mapList) {
+            for (Map.Entry<String, Integer> m : map.entrySet()) {
+                resultMap.put(m.getKey(), m.getValue());
+            }
+        }
+        return resultMap;
+    }
+
+    /**
+     * @return java.util.Map<java.lang.String,java.lang.Integer>
+     * @param customerId
+     * @param monthId
+     * @author yinzuomei
+     * @description 2、查询客户下，这个月内，每个党员评论话题的次数
+     * @Date 2020/9/18 13:33
+     **/
+    private Map<String, Integer> calJoinTopicCount(String customerId, String monthId) {
+        List<Map<String, Integer>> mapList = factOriginTopicLogDailyService.selectJoinTopicCount(customerId, monthId);
+        Map<String, Integer> resultMap = new HashMap<>();
+        for (Map<String, Integer> map : mapList) {
+            for (Map.Entry<String, Integer> m : map.entrySet()) {
+                resultMap.put(m.getKey(), m.getValue());
+            }
+        }
+        return resultMap;
+    }
+
+
+    /**
+     * @return java.util.Map<java.lang.String,java.lang.Integer>
+     * @param customerId
+     * @param monthId
+     * @author yinzuomei
+     * @description 3、党员提出的话题转议题数
+     * @Date 2020/9/18 13:53
+     **/
+    private Map<String, Integer> calShiftIssueCount(String customerId, String monthId) {
+        List<Map<String, Integer>> mapList = issueExtractService.selectShiftIssueCount(customerId, monthId);
+        Map<String, Integer> resultMap = new HashMap<>();
+        for (Map<String, Integer> map : mapList) {
+            for (Map.Entry<String, Integer> m : map.entrySet()) {
+                resultMap.put(m.getKey(), m.getValue());
+            }
+        }
+        return resultMap;
+    }
+
+    /**
+     * @return java.util.Map<java.lang.String,java.lang.Integer>
+     * @param customerId
+     * @param monthId
+     * @author yinzuomei
+     * @description 4、党员提出的议题转项目数
+     * @Date 2020/9/18 14:10
+     **/
+    private Map<String, Integer> calShiftProjectCount(String customerId, String monthId) {
+        List<Map<String, Integer>> mapList = issueExtractService.selectShiftProjectCount(customerId, monthId);
+        Map<String, Integer> resultMap = new HashMap<>();
+        for (Map<String, Integer> map : mapList) {
+            for (Map.Entry<String, Integer> m : map.entrySet()) {
+                resultMap.put(m.getKey(), m.getValue());
+            }
+        }
+        return resultMap;
+    }
+
+    /**
+     * @return java.util.Map<java.lang.String,java.lang.Integer>
+     * @param customerId
+     * @param monthId
+     * @author yinzuomei
+     * @description 6、党员自建群群众人数
+     * @Date 2020/9/18 15:38
+     **/
+    private Map<String, Integer> calgroupUserCount(String customerId, String monthId) {
+        // TODO
+        return null;
     }
 
+    /**
+     * @param customerId
+     * @param monthId
+     * @return java.util.Map<java.lang.String, java.lang.Integer>
+     * @author yinzuomei
+     * @description 8、党员自建群活跃度——话题数
+     * @Date 2020/9/18 14:31
+     **/
+    private Map<String, Integer> calGroupTopicCountMap(String customerId, String monthId) {
+        List<Map<String, Integer>> mapList = factOriginTopicLogDailyService.selectGroupTopicCount(customerId, monthId);
+        Map<String, Integer> resultMap = new HashMap<>();
+        for (Map<String, Integer> map : mapList) {
+            for (Map.Entry<String, Integer> m : map.entrySet()) {
+                resultMap.put(m.getKey(), m.getValue());
+            }
+        }
+        return resultMap;
+    }
 
     /**
      * @param customerId

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

@@ -17,20 +17,51 @@
 
 package com.epmet.service.evaluationindex.extract.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
 import com.epmet.service.evaluationindex.extract.FactOriginTopicLogDailyService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 话题明细_日统计
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-15
  */
+@DataSource(DataSourceConstant.STATS)
 @Service
 public class FactOriginTopicLogDailyServiceImpl extends BaseServiceImpl<FactOriginTopicLogDailyDao, FactOriginTopicLogDailyEntity> implements FactOriginTopicLogDailyService {
 
 
+    /**
+     * @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) {
+        return baseDao.selectJoinTopicCount(customerId,monthId);
+    }
+
+    /**
+     * @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) {
+        return baseDao.selectGroupTopicCount(customerId,monthId);
+    }
 }

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

@@ -17,11 +17,13 @@
 
 package com.epmet.service.evaluationindex.extract.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.DimObjectActionConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao;
@@ -54,6 +56,7 @@ import java.util.stream.Collectors;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-15
  */
+@DataSource(value = DataSourceConstant.STATS)
 @Slf4j
 @Service
 public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOriginTopicMainDailyDao, FactOriginTopicMainDailyEntity> implements FactOriginTopicMainDailyService {
@@ -67,8 +70,6 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
     private UserService userService;
 
     /**
-     * @param customerId 客户id
-     * @param dateId     yyyyMMdd
      * @return void
      * @author yinzuomei 数据采集：话题本身
      * @description fact_origin_topic_log_daily    话题明细_日统计  fact_origin_topic_main_daily	话题主表_日统计
@@ -96,6 +97,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
         return true;
     }
 
+
     private Map<String, GridInfoDTO> getGridInfoMap(String customerId) {
         Map<String ,GridInfoDTO> map=new HashMap<>();
         List<GridInfoDTO> list=customerGridService.queryGridInfoList(customerId);
@@ -226,5 +228,15 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
     }
 
 
-
+    /**
+     * @param customerId
+     * @param monthId    yyyyMM
+     * @author yinzuomei
+     * @description 党员提出话题数：返回每个党员这个月内，提出的话题数
+     * @Date 2020/9/18 11:03
+     **/
+    @Override
+    public List<Map<String, Integer>> 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/impl/IssueExtractServiceImpl.java

@@ -1,9 +1,11 @@
 package com.epmet.service.evaluationindex.extract.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.dto.form.TimeListResultDTO;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.ExtractConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginIssueLogDailyDao;
 import com.epmet.dao.evaluationindex.extract.FactOriginIssueMainDailyDao;
@@ -240,4 +242,32 @@ public class IssueExtractServiceImpl implements IssueExtractService {
         issueLogDailyDao.insertIssueLogList(result);
     }
 
+
+
+    /**
+     * @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) {
+        return issueMainDailyDao.selectShiftIssueCount(customerId,monthId);
+    }
+
+    /**
+     * @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) {
+        return issueMainDailyDao.selectShiftProjectCount(customerId,monthId);
+    }
 }

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

@@ -66,4 +66,37 @@
             CUSTOMER_ID = #{customerId}
           AND DATE_ID = #{dateId}
     </delete>
+
+    <!--   党员提出的话题转议题数 -->
+    <select id="selectShiftIssueCount" parameterType="map"  resultType="java.util.Map">
+        SELECT
+            t1.CREATE_TOPIC_USER_ID AS USER_ID,
+            COUNT( 1 ) AS SHIFT_ISSUE_COUNT
+        FROM
+            fact_origin_issue_main_daily t1
+        WHERE
+            t1.DEL_FLAG = '0'
+--             AND t1.TOPIC_USER_IS_PARTY = '1'
+            AND t1.CUSTOMER_ID = #{customerId}
+            AND t1.MONTH_ID = #{monthId}
+        GROUP BY
+            T1.CREATE_TOPIC_USER_ID
+    </select>
+
+    <!--  党员提出的议题转项目数  -->
+    <select id="selectShiftProjectCount" parameterType="map"  resultType="java.util.Map">
+        SELECT
+                t1.CREATE_TOPIC_USER_ID AS USER_ID,
+                COUNT( 1 ) AS SHIFT_PROJECT_COUNT
+        FROM
+                fact_origin_issue_main_daily t1
+        WHERE
+                t1.DEL_FLAG = '0'
+--                 AND t1.TOPIC_USER_IS_PARTY = '1'
+                AND T1.ISSUE_STATUS='shift_project'
+                AND t1.CUSTOMER_ID = #{customerId}
+                AND t1.MONTH_ID = #{monthId}
+        GROUP BY
+                T1.CREATE_TOPIC_USER_ID
+    </select>
 </mapper>

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

@@ -65,4 +65,39 @@
             )
         </foreach>
     </insert>
+
+    <!--  查询客户下，这个月内，每个党员评论话题的次数  -->
+    <select id="selectJoinTopicCount" parameterType="map"  resultType="java.util.Map">
+        SELECT
+            t1.OPERATE_USER_ID,
+            count( 1 ) AS JOIN_TOPIC_COUNT
+        FROM
+            fact_origin_topic_log_daily t1
+        WHERE
+            t1.DEL_FLAG = '0'
+            AND t1.CUSTOMER_ID = #{customerId}
+            AND t1.MONTH_ID = #{monthId}
+--             AND t1.OPERATE_USER_IS_PARTY = '1'
+            AND t1.ACTION_CODE = 'comment'
+        GROUP BY
+            t1.OPERATE_USER_ID
+    </select>
+
+    <!-- 党员自建群活跃度——话题数 -->
+    <select id="selectGroupTopicCount" parameterType="map"  resultType="java.util.Map">
+        select T2.USER_ID,
+        COUNT(1) AS GROUP_TOPIC_COUNT
+        from fact_origin_topic_main_daily t1
+        INNER JOIN (
+            select main.GROUP_OWNER_ID AS USER_ID,main.ID AS GROUP_ID
+            from fact_origin_group_main_daily main
+            where main.DEL_FLAG='0'
+            and main.GROUP_STATE='approved'
+            and main.CUSTOMER_ID=#{customerId}
+        )t2 ON t1.GROUP_ID = t2.GROUP_ID
+        where t1.DEL_FLAG='0'
+        and t1.CUSTOMER_ID=#{customerId}
+        and t1.MONTH_ID=#{monthId}
+        group by t2.USER_ID
+    </select>
 </mapper>

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

@@ -62,4 +62,20 @@
             )
         </foreach>
     </insert>
+
+    <!--  党员提出话题数：返回每个党员这个月内，提出的话题数  -->
+    <select id="selectPartyCreateTopicCount" parameterType="map" resultType="java.util.Map">
+        SELECT
+            T1.CREATE_TOPIC_USER_ID AS USER_ID,
+            COUNT( 1 ) AS CREATE_TOPIC_COUNT
+        FROM
+            fact_origin_topic_main_daily t1
+        WHERE
+            t1.DEL_FLAG = '0'
+--         AND t1.CREATE_TOPIC_USER_IS_PARTY = '1'
+        and t1.MONTH_ID=#{monthId}
+        and t1.CUSTOMER_ID=#{customerId}
+        GROUP BY
+            T1.CREATE_TOPIC_USER_ID
+    </select>
 </mapper>