先进模范-组织

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

@@ -123,13 +123,11 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
     /**
      * @return int
      * @param customerId
-     * @param partyMemberUserIds
      * @author yinzuomei
-     * @description 根据党员ids, 查询党员发布议题数
+     * @description 查询党员发布议题数
      * @Date 2020/9/23 15:13
      **/
     int getParyPublishIssueTotal(@Param("customerId") String customerId,
-                                 @Param("list")List<String> partyMemberUserIds,
                                  @Param("gridId")String gridId,
                                  @Param("agencyId")String agencyId);
 
@@ -153,4 +151,36 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
      * @Date 2020/9/23 15:45
      **/
     int getGridOrCommunityShiftProjectTotal(@Param("customerId") String customerId, @Param("gridId") String gridId,@Param("communityId") String communityId);
+
+    /**
+     * @return java.lang.Integer
+     * @param customerId
+     * @param agencyPath
+     * @author yinzuomei
+     * @description 组织内： 党员发布议题
+     * @Date 2020/9/24 16:23
+     **/
+    Integer getAgencyParyPublishIssueTotal(@Param("customerId")String customerId,
+                                           @Param("agencyPath")String agencyPath);
+
+    /**
+     * @return int
+     * @param customerId
+     * @param agencyPath
+     * @author yinzuomei
+     * @description 组织内：所有议题总数
+     * @Date 2020/9/24 16:26
+     **/
+    int getAgencyIssueTotal(@Param("customerId")String customerId,
+                            @Param("agencyPath")String agencyPath);
+    /**
+     * @return java.lang.Integer
+     * @param customerId
+     * @param agencyPath
+     * @author yinzuomei
+     * @description 组织下：议题转项目数
+     * @Date 2020/9/24 17:05
+     **/
+    Integer getAgencyShiftProjectTotal(@Param("customerId")String customerId,
+                                       @Param("agencyPath")String agencyPath);
 }

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

@@ -121,4 +121,17 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 									  @Param("gridId") String gridId,
 									  @Param("communityId") String communityId,
 									  @Param("closedStatus") String closedStatus);
+
+    /**
+     * @return int
+     * @param customerId
+     * @param agencyPath
+     * @param closedStatus
+     * @author yinzuomei
+     * @description 组织下：已解决项目  or  已结案项目总数
+     * @Date 2020/9/24 17:38
+     **/
+	int getAgencyClosedProjectTotal(@Param("customerId") String customerId,
+									@Param("agencyPath")String agencyPath,
+									@Param("closedStatus")String closedStatus);
 }

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

@@ -79,13 +79,11 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
     /**
      * @return int
      * @param customerId
-     * @param partyMemberUserIds
      * @author yinzuomei
      * @description 党员提出的话题总数
      * @Date 2020/9/23 13:46
      **/
     int selectPublishedByPartyTopicCount(@Param("customerId") String customerId,
-                                         @Param("list") List<String> partyMemberUserIds,
                                          @Param("gridId")String gridId,
                                          @Param("agencyId")String agencyId);
 
@@ -106,4 +104,16 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
      * @Date 2020/9/23 17:59
      **/
     void updateFactOriginTopicMain(@Param("topicId")String topicId,@Param("topicStatus")String topicStatus,@Param("closedStatus")String closedStatus);
+
+    /**
+     * @return java.lang.Integer
+     * @param customerId
+     * @param agencyPath
+     * @author yinzuomei
+     * @description 
+     * @Date 2020/9/24 15:53 
+     **/
+    Integer getAgencyPartyTopicTotal(@Param("customerId") String customerId,
+                                     @Param("agencyPath")String agencyPath,
+                                     @Param("createTopicUserIsParty") String createTopicUserIsParty);
 }

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

@@ -20,8 +20,6 @@ package com.epmet.service.evaluationindex.extract.todata;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.entity.evaluationindex.extract.FactOriginIssueMainDailyEntity;
 
-import java.util.List;
-
 /**
  *  议题主表
  *
@@ -33,12 +31,11 @@ public interface FactOriginIssueMainDailyService extends BaseService<FactOriginI
     /**
      * @return int
      * @param customerId
-     * @param partyMemberUserIds
      * @author yinzuomei
      * @description 根据党员ids,查询党员发布议题数
      * @Date 2020/9/23 15:11
      **/
-    int getParyPublishIssueTotal(String customerId, List<String> partyMemberUserIds,String gridId,String agencyId);
+    int getParyPublishIssueTotal(String customerId,String gridId,String agencyId);
 
     /**
      * @return java.lang.Integer
@@ -59,4 +56,34 @@ public interface FactOriginIssueMainDailyService extends BaseService<FactOriginI
      * @Date 2020/9/24 10:45
      **/
     int getGridOrCommunityIssueTotal(String customerId, String gridId,String communityId);
+
+    /**
+     * @return java.lang.Integer
+     * @param customerId
+     * @param agencyPath
+     * @author yinzuomei
+     * @description 组织内： 党员发布议题
+     * @Date 2020/9/24 16:23
+     **/
+    Integer getAgencyParyPublishIssueTotal(String customerId, String agencyPath);
+
+    /**
+     * @return int
+     * @param customerId
+     * @param agencyPath
+     * @author yinzuomei
+     * @description 组织内：所有议题总数
+     * @Date 2020/9/24 16:26
+     **/
+    int getAgencyIssueTotal(String customerId, String agencyPath);
+
+    /**
+     * @return java.lang.Integer
+     * @param customerId
+     * @param agencyPath
+     * @author yinzuomei
+     * @description 组织下：议题转项目数
+     * @Date 2020/9/24 17:04
+     **/
+    Integer getAgencyShiftProjectTotal(String customerId, String agencyPath);
 }

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

@@ -174,4 +174,15 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @Date 2020/9/23 18:17
      **/
     Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId, String communityId,String closedStatus);
+
+    /**
+     * @return int
+     * @param customerId
+     * @param agencyPath
+     * @param closedStatus
+     * @author yinzuomei
+     * @description 组织下：已解决项目  or  已结案项目总数
+     * @Date 2020/9/24 17:37
+     **/
+    int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus);
 }

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

@@ -65,12 +65,11 @@ public interface FactOriginTopicMainDailyService extends BaseService<FactOriginT
     /**
      * @return int
      * @param customerId
-     * @param partyMemberUserIds 党员用户id
      * @author yinzuomei
      * @description 党员提出的话题总数
      * @Date 2020/9/23 13:36
      **/
-    int calPublishedByPartyTopicCount(String customerId,List<String> partyMemberUserIds,String gridId,String agencyId);
+    int calPublishedByPartyTopicCount(String customerId,String gridId,String agencyId);
     /**
      * @return int
      * @param customerId
@@ -81,4 +80,14 @@ public interface FactOriginTopicMainDailyService extends BaseService<FactOriginT
      **/
     int calGridOrCommunityTopicTotal(String customerId, String gridId,String communityId);
 
+    /**
+     * @return java.lang.Integer
+     * @param customerId
+     * @param agencyPath
+     * @param createTopicUserIsParty 1是党员
+     * @author yinzuomei
+     * @description 在当前组织下，话题总数（createTopicUserIsParty=1时查询党员发布的话题总数）
+     * @Date 2020/9/24 15:49
+     **/
+    Integer getAgencyPartyTopicTotal(String customerId, String agencyPath,String createTopicUserIsParty);
 }

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

@@ -19,16 +19,12 @@ package com.epmet.service.evaluationindex.extract.todata.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.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginIssueMainDailyDao;
 import com.epmet.entity.evaluationindex.extract.FactOriginIssueMainDailyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
 
 /**
  *  议题主表
@@ -44,18 +40,14 @@ public class FactOriginIssueMainDailyServiceImpl extends BaseServiceImpl<FactOri
 
     /**
      * @param customerId
-     * @param partyMemberUserIds
      * @return int
      * @author yinzuomei
      * @description 根据党员ids, 查询党员发布议题数
      * @Date 2020/9/23 15:11
      **/
     @Override
-    public int getParyPublishIssueTotal(String customerId, List<String> partyMemberUserIds,String gridId,String agencyId) {
+    public int getParyPublishIssueTotal(String customerId,String gridId,String agencyId) {
-        if(CollectionUtils.isEmpty(partyMemberUserIds)){
+        return baseDao.getParyPublishIssueTotal(customerId,gridId,agencyId);
-            return NumConstant.ZERO;
-        }
-        return baseDao.getParyPublishIssueTotal(customerId,partyMemberUserIds,gridId,agencyId);
     }
 
     /**
@@ -83,4 +75,43 @@ public class FactOriginIssueMainDailyServiceImpl extends BaseServiceImpl<FactOri
     public int getGridOrCommunityIssueTotal(String customerId, String gridId,String communityId) {
         return baseDao.getGridOrCommunityIssueTotal(customerId,gridId,communityId);
     }
+
+    /**
+     * @param customerId
+     * @param agencyPath
+     * @return java.lang.Integer
+     * @author yinzuomei
+     * @description 组织内： 党员发布议题
+     * @Date 2020/9/24 16:23
+     **/
+    @Override
+    public Integer getAgencyParyPublishIssueTotal(String customerId, String agencyPath) {
+        return baseDao.getAgencyParyPublishIssueTotal(customerId,agencyPath);
+    }
+
+    /**
+     * @param customerId
+     * @param agencyPath
+     * @return int
+     * @author yinzuomei
+     * @description 组织内：所有议题总数
+     * @Date 2020/9/24 16:26
+     **/
+    @Override
+    public int getAgencyIssueTotal(String customerId, String agencyPath) {
+        return baseDao.getAgencyIssueTotal(customerId,agencyPath);
+    }
+
+    /**
+     * @param customerId
+     * @param agencyPath
+     * @return java.lang.Integer
+     * @author yinzuomei
+     * @description 组织下：议题转项目数
+     * @Date 2020/9/24 17:04
+     **/
+    @Override
+    public Integer getAgencyShiftProjectTotal(String customerId, String agencyPath) {
+        return baseDao.getAgencyShiftProjectTotal(customerId,agencyPath);
+    }
 }

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

@@ -184,4 +184,18 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
     public Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId,String communityId, String closedStatus) {
         return baseDao.getGridOrCommunityClosedProjectTotal(customerId,gridId,communityId,closedStatus);
     }
+
+    /**
+     * @param customerId
+     * @param agencyPath
+     * @param closedStatus
+     * @return int
+     * @author yinzuomei
+     * @description 组织下：已解决项目  or  已结案项目总数
+     * @Date 2020/9/24 17:37
+     **/
+    @Override
+    public int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus) {
+        return baseDao.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus);
+    }
 }

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

@@ -277,18 +277,14 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
 
     /**
      * @param customerId
-     * @param partyMemberUserIds
      * @return int
      * @author yinzuomei
      * @description 党员提出的话题总数
      * @Date 2020/9/23 13:36
      **/
     @Override
-    public int calPublishedByPartyTopicCount(String customerId,List<String> partyMemberUserIds,String gridId,String agencyId) {
+    public int calPublishedByPartyTopicCount(String customerId,String gridId,String agencyId) {
-        if(CollectionUtils.isEmpty(partyMemberUserIds)){
+        return baseDao.selectPublishedByPartyTopicCount(customerId,gridId,agencyId);
-            return NumConstant.ZERO;
-        }
-        return baseDao.selectPublishedByPartyTopicCount(customerId,partyMemberUserIds,gridId,agencyId);
     }
 
     /**
@@ -304,4 +300,17 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
         return baseDao.selectGridOrCommunityTopicTotal(customerId,gridId,communityId);
     }
 
+    /**
+     * @param customerId
+     * @param agencyPath
+     * @return java.lang.Integer
+     * @author yinzuomei
+     * @description 在当前组织下，话题总数（createTopicUserIsParty=1时查询党员发布的话题总数）
+     * @Date 2020/9/24 15:49
+     **/
+    @Override
+    public Integer getAgencyPartyTopicTotal(String customerId, String agencyPath,String createTopicUserIsParty) {
+        return baseDao.getAgencyPartyTopicTotal(customerId,agencyPath,createTopicUserIsParty);
+    }
+
 }

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

@@ -9,7 +9,6 @@ import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDai
 import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
 import com.epmet.service.evaluationindex.extract.toscreen.PioneerDataExtractService;
 import com.epmet.service.evaluationindex.screen.ScreenPioneerDataService;
-import com.epmet.service.stats.DimCustomerPartymemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -33,8 +32,6 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
     @Autowired
     private FactOriginTopicMainDailyService factOriginTopicMainDailyService;
     @Autowired
-    private DimCustomerPartymemberService dimCustomerPartymemberService;
-    @Autowired
     private FactOriginIssueMainDailyService factOriginIssueMainDailyService;
     @Autowired
     private FactOriginProjectMainDailyService factOriginProjectMainDailyService;
@@ -63,12 +60,8 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             entity.setIssueRatio(BigDecimal.ZERO);
 
 
-            //网格内的党员集合
-            List<String> partyMemberUserIds = dimCustomerPartymemberService.getPartyMemberUserIds(customerId, "grid", gridId);
-
-
             //3、党员发布话题:
-            entity.setTopicTotal(getTopicTotal(customerId, partyMemberUserIds, gridId, null));
+            entity.setTopicTotal(getTopicTotal(customerId, gridId, null));
             //4、党员发布话题占比: 网格内注册党员发布的话题总数占  网格内话题总数的 比率
             if (entity.getTopicTotal() == NumConstant.ZERO) {
                 entity.setTopicRatio(BigDecimal.ZERO);
@@ -82,7 +75,7 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             int gridIssueTotal = getGridOrCommunityIssueTotal(customerId, gridId, null);
             if (gridIssueTotal != NumConstant.ZERO) {
                 //5、党员发布议题
-                entity.setPublishIssueTotal(getParyPublishIssueTotal(customerId, partyMemberUserIds, gridId, null));
+                entity.setPublishIssueTotal(getParyPublishIssueTotal(customerId, gridId, null));
                 //6、党员发布议题占比 :  占网格内所有议题的比率
                 if (entity.getPublishIssueTotal() == NumConstant.ZERO) {
                     entity.setPublishIssueRatio(BigDecimal.ZERO);
@@ -124,12 +117,9 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             //2、党员参与议事占比 todo
             entity.setIssueRatio(BigDecimal.ZERO);
 
-            //社区内的党员集合
-            List<String> partyMemberUserIds = dimCustomerPartymemberService.getPartyMemberUserIds(customerId, "community", communityId);
-
 
             //3、党员发布话题:
-            entity.setTopicTotal(getTopicTotal(customerId, partyMemberUserIds, null, communityId));
+            entity.setTopicTotal(getTopicTotal(customerId, null, communityId));
             //4、党员发布话题占比: 社区内注册党员发布的话题总数占  社区内话题总数的 比率
             if (entity.getTopicTotal() == NumConstant.ZERO) {
                 entity.setTopicRatio(BigDecimal.ZERO);
@@ -143,7 +133,7 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             int communityIssueTotal = getGridOrCommunityIssueTotal(customerId, null, communityId);
             if (communityIssueTotal != NumConstant.ZERO) {
                 //5、党员发布议题
-                entity.setPublishIssueTotal(getParyPublishIssueTotal(customerId, partyMemberUserIds, null, communityId));
+                entity.setPublishIssueTotal(getParyPublishIssueTotal(customerId, null, communityId));
                 //6、党员发布议题占比 :  占社区内所有议题的比率
                 if (entity.getPublishIssueTotal() == NumConstant.ZERO) {
                     entity.setPublishIssueRatio(BigDecimal.ZERO);
@@ -173,7 +163,7 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
 
     @Override
     public void extractExceptCommunityPioneerData(String customerId, String dateId) {
-        //查询客户下所有的社区，初始数据值为0
+        //查询客户下所有的组织（社区除外），初始数据值为0
         List<ScreenPioneerDataEntity> agencyList = screenPioneerDataService.initPioneerDataList(customerId, "agency");
         if (CollectionUtils.isEmpty(agencyList)) {
             return;
@@ -190,18 +180,16 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             } else {
                 entity.setAgencyPath(entity.getAgencyPids().concat(StrConstant.COLON).concat(entity.getOrgId()));
             }
-            //组织内党员集合
-            List<String> partyMemberUserIds = dimCustomerPartymemberService.getPartyMemberUserIds(customerId, "agency", entity.getAgencyPath());
 
 
             //3、党员发布话题:
-            entity.setTopicTotal(getAgencyPartyTopicTotal(customerId, partyMemberUserIds, entity.getAgencyPath()));
+            entity.setTopicTotal(getAgencyTopicTotal(customerId, entity.getAgencyPath(),NumConstant.ONE_STR));
             //4、党员发布话题占比: 组织内注册党员发布的话题总数占  组织内话题总数的 比率
             if (entity.getTopicTotal() == NumConstant.ZERO) {
                 entity.setTopicRatio(BigDecimal.ZERO);
             } else {
                 //当前组织内所有话题总数
-                int agencyTopicTotal = getAgencyTopicTotal(customerId, entity.getAgencyPath());
+                int agencyTopicTotal = getAgencyTopicTotal(customerId, entity.getAgencyPath(),null);
                 entity.setTopicRatio(agencyTopicTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getTopicTotal() / agencyTopicTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }
 
@@ -209,7 +197,7 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             int agencyIssueTotal = getAgencyIssueTotal(customerId, entity.getAgencyPath());
             if (agencyIssueTotal != NumConstant.ZERO) {
                 //5、党员发布议题
-                entity.setPublishIssueTotal(getAgencyParyPublishIssueTotal(customerId, partyMemberUserIds, entity.getAgencyPath()));
+                entity.setPublishIssueTotal(getAgencyParyPublishIssueTotal(customerId, entity.getAgencyPath()));
                 //6、党员发布议题占比 :  占社区内所有议题的比率
                 if (entity.getPublishIssueTotal() == NumConstant.ZERO) {
                     entity.setPublishIssueRatio(BigDecimal.ZERO);
@@ -237,117 +225,97 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
 
     }
 
-    private int getAgencyClosedProjectTotal(String customerId, String agencyPath, String resolved) {
+    //组织下：已解决项目  or  已结案项目总数
-        //todo
+    private int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus) {
-        return 0;
+        return factOriginProjectMainDailyService.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus);
     }
 
+    //组织下：议题转项目数
     private Integer getAgencyShiftProjectTotal(String customerId, String agencyPath) {
-        //todo
+        return factOriginIssueMainDailyService.getAgencyShiftProjectTotal(customerId,agencyPath);
-        return 0;
     }
 
-    private Integer getAgencyParyPublishIssueTotal(String customerId, List<String> partyMemberUserIds, String agencyPath) {
+    //组织内： 党员发布议题
-        //todo
+    private Integer getAgencyParyPublishIssueTotal(String customerId, String agencyPath) {
-        return 0;
+        return factOriginIssueMainDailyService.getAgencyParyPublishIssueTotal(customerId,agencyPath);
     }
 
+    //组织内：所有议题总数
     private int getAgencyIssueTotal(String customerId, String agencyPath) {
-        //todo
+        return factOriginIssueMainDailyService.getAgencyIssueTotal(customerId,agencyPath);
-        return 0;
     }
 
-    private int getAgencyTopicTotal(String customerId, String agencyPath) {
-        //todo
-        return 0;
-    }
 
-    private Integer getAgencyPartyTopicTotal(String customerId, List<String> partyMemberUserIds, String agencyPath) {
+    //在当前组织下，话题总数（createTopicUserIsParty=1时查询党员发布的话题总数）
-        //todo
+    private Integer getAgencyTopicTotal(String customerId, String agencyPath,String createTopicUserIsParty) {
-        return 0;
+        return factOriginTopicMainDailyService.getAgencyPartyTopicTotal(customerId,agencyPath,createTopicUserIsParty);
     }
 
 
     /**
-     * @param customerId
+     * @param customerId 客户id
-     * @param gridId
+     * @param gridId 网格id
-     * @param communityId
+     * @param communityId 社区的agencyId
      * @param closedStatus 结案状态：已解决 resolved，未解决 unresolved
-     * @return java.lang.Integer
+     * @description 网格或者社区下:  已解决项目
-     * @author yinzuomei
-     * @description 网格内已解决项目
-     * @Date 2020/9/23 16:24
      **/
     private Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId, String communityId, String closedStatus) {
         return factOriginProjectMainDailyService.getGridOrCommunityClosedProjectTotal(customerId, gridId, communityId, closedStatus);
     }
 
     /**
-     * @param customerId
-     * @param partyMemberUserIds
      * @return int
-     * @author yinzuomei
+     * @param customerId 客户id
-     * @description 党员发布的话题总数
+     * @param gridId 网格id
-     * @Date 2020/9/23 13:44
+     * @param agencyId 社区的agencyId
+     * @description 网格或者社区下: 党员发布的话题总数
      **/
-    private int getTopicTotal(String customerId, List<String> partyMemberUserIds, String gridId, String agencyId) {
+    private int getTopicTotal(String customerId, String gridId, String agencyId) {
-        if (CollectionUtils.isEmpty(partyMemberUserIds)) {
+        return factOriginTopicMainDailyService.calPublishedByPartyTopicCount(customerId, gridId, agencyId);
-            //如果网格内没有党员，直接返回0
-            return NumConstant.ZERO;
-        }
-        return factOriginTopicMainDailyService.calPublishedByPartyTopicCount(customerId, partyMemberUserIds, gridId, agencyId);
     }
 
     /**
-     * @param customerId
+     * @return int
-     * @param partyMemberUserIds
+     * @param customerId 客户id
-     * @return java.lang.Integer
+     * @param gridId 网格id
-     * @author yinzuomei
+     * @param communityId 社区的agencyId
-     * @description 党员发布的议题总数
+     * @description 网格或者社区下  ：话题总数
-     * @Date 2020/9/23 14:39
      **/
-    private int getParyPublishIssueTotal(String customerId, List<String> partyMemberUserIds, String gridId, String agencyId) {
+    private int getGridOrCommunityTopicTotal(String customerId, String gridId, String communityId) {
-        if (CollectionUtils.isEmpty(partyMemberUserIds)) {
+        return factOriginTopicMainDailyService.calGridOrCommunityTopicTotal(customerId, gridId, communityId);
-            return NumConstant.ZERO;
-        }
-        return factOriginIssueMainDailyService.getParyPublishIssueTotal(customerId, partyMemberUserIds, gridId, agencyId);
     }
 
     /**
-     * @param customerId
+     * @return int
-     * @param gridId
+     * @param customerId 客户id
-     * @return java.lang.Integer
+     * @param gridId 网格id
-     * @author yinzuomei
+     * @param agencyId 社区的agencyId
-     * @description 网格内议题转项目数
+     * @description 网格或者社区下: 党员发布的议题总数
-     * @Date 2020/9/23 15:38
      **/
-    private Integer getGridOrCommunityShiftProjectTotal(String customerId, String gridId, String communityId) {
+    private int getParyPublishIssueTotal(String customerId, String gridId, String agencyId) {
-        return factOriginIssueMainDailyService.getGridOrCommunityShiftProjectTotal(customerId, gridId, communityId);
+        return factOriginIssueMainDailyService.getParyPublishIssueTotal(customerId, gridId, agencyId);
     }
 
-
     /**
-     * @param customerId
-     * @param communityId
      * @return int
-     * @author yinzuomei
+     * @param customerId 客户id
-     * @description
+     * @param gridId 网格id
-     * @Date 2020/9/24 10:44
+     * @param communityId 社区的agencyId
+     * @description 网格或者社区下 ：议题总数
      **/
     private int getGridOrCommunityIssueTotal(String customerId, String gridId, String communityId) {
         return factOriginIssueMainDailyService.getGridOrCommunityIssueTotal(customerId, gridId, communityId);
     }
 
     /**
-     * @param customerId
+     * @return java.lang.Integer
-     * @param communityId
+     * @param customerId 客户id
-     * @return int
+     * @param gridId 网格id
-     * @author yinzuomei
+     * @param communityId 社区的agencyId
-     * @description 当前社区内所有话题总数
+     * @description 网格或者社区下: 议题转项目数
-     * @Date 2020/9/24 10:32
      **/
-    private int getGridOrCommunityTopicTotal(String customerId, String gridId, String communityId) {
+    private Integer getGridOrCommunityShiftProjectTotal(String customerId, String gridId, String communityId) {
-        return factOriginTopicMainDailyService.calGridOrCommunityTopicTotal(customerId, gridId, communityId);
+        return factOriginIssueMainDailyService.getGridOrCommunityShiftProjectTotal(customerId, gridId, communityId);
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimCustomerPartymemberService.java

@@ -126,7 +126,7 @@ public interface DimCustomerPartymemberService extends BaseService<DimCustomerPa
      * @param customerId
      * @param orgId： 网格id 或者社区id
      * @type grid,community
-     * @author yinzuomei
+     * @author yinzuomei  暂时这个方法没用
      * @description 查询在本网格或者社区注册 或者  组织下 的党员id
      * @Date 2020/9/23 14:18
      **/

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

@@ -176,7 +176,7 @@
             GROUP BY GRID_ID
     </select>
 
-    <!--    根据党员ids, 查询党员发布议题数 -->
+    <!--     查询党员发布议题数 -->
     <select id="getParyPublishIssueTotal" parameterType="map" resultType="java.lang.Integer">
         SELECT
             count( ID ) AS total
@@ -185,16 +185,13 @@
         WHERE
             t1.DEL_FLAG = '0'
             AND t1.CUSTOMER_ID = #{customerId}
+            AND t1.TOPIC_USER_IS_PARTY='1'
             <if test='null != gridId and ""!=gridId'>
                 and t1.GRID_ID=#{gridId}
             </if>
             <if test='null != agencyId and ""!=agencyId'>
                 and t1.AGENCY_ID=#{agencyId}
             </if>
-            AND
-            <foreach collection="list" item="userId" separator="or" open="(" close=")">
-                    t1.CREATE_TOPIC_USER_ID=#{userId}
-            </foreach>
     </select>
     <!--   具体某个网格、社区下的议题总数  -->
     <select id="getGridOrCommunityIssueTotal" parameterType="map" resultType="java.lang.Integer">
@@ -230,4 +227,42 @@
                 and t1.AGENCY_ID=#{communityId}
             </if>
     </select>
+
+    <!--    组织内： 党员发布议题 -->
+    <select id="getAgencyParyPublishIssueTotal" parameterType="map" resultType="java.lang.Integer">
+        SELECT
+            count( ID ) AS total
+        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.PIDS LIKE CONCAT(#{agencyPath},'%')
+    </select>
+
+    <!--  组织内：所有议题总数  -->
+    <select id="getAgencyIssueTotal" parameterType="map" resultType="int">
+        SELECT
+            count( ID ) AS total
+        FROM
+            fact_origin_issue_main_daily t1
+        WHERE
+            t1.DEL_FLAG = '0'
+            AND t1.CUSTOMER_ID = #{customerId}
+            and t1.PIDS LIKE CONCAT(#{agencyPath},'%')
+    </select>
+
+    <!--  组织下：议题转项目数  -->
+    <select id="getAgencyShiftProjectTotal" parameterType="map" resultType="java.lang.Integer">
+        SELECT
+            count( ID ) AS total
+        FROM
+            fact_origin_issue_main_daily t1
+        WHERE
+            t1.DEL_FLAG = '0'
+            AND t1.ISSUE_STATUS = 'shift_project'
+            AND t1.CUSTOMER_ID = #{customerId}
+            and t1.PIDS LIKE CONCAT(#{agencyPath},'%')
+    </select>
 </mapper>

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

@@ -163,4 +163,19 @@
                 and t1.CLOSED_STATUS=#{closedStatus}
             </if>
     </select>
+
+    <!--  组织下：已解决项目  or  已结案项目总数  -->
+    <select id="getAgencyClosedProjectTotal" parameterType="map" resultType="int">
+        SELECT
+            COUNT( 1 ) AS TOTAL
+        FROM
+            fact_origin_project_main_daily T1
+        WHERE
+            T1.DEL_FLAG = '0'
+            AND T1.CUSTOMER_ID = #{customerId}
+            and t1.PIDS LIKE CONCAT(#{agencyPath},'%')
+            <if test='null != closedStatus and "" != closedStatus'>
+                and t1.CLOSED_STATUS=#{closedStatus}
+            </if>
+    </select>
 </mapper>

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

@@ -106,16 +106,13 @@
         WHERE
             T1.DEL_FLAG = '0'
             AND T1.CUSTOMER_ID = #{customerId}
+            AND m.CREATE_TOPIC_USER_IS_PARTY='1'
             <if test='null != gridId and "" !=gridId'>
                 AND T1.GRID_ID=#{gridId}
             </if>
             <if test='null != agencyId and "" !=agencyId'>
                 AND T1.AGENCY_ID=#{agencyId}
             </if>
-            AND
-            <foreach collection="list" item="userId" separator="or" open="(" close=")">
-                T1.CREATE_TOPIC_USER_ID=#{userId}
-            </foreach>
     </select>
     <!--    具体某个网格、社区下的话题数 -->
     <select id="selectGridOrCommunityTopicTotal" parameterType="map" resultType="java.lang.Integer">
@@ -141,4 +138,19 @@
                     UPDATED_TIME=NOW()
             where id = #{topicId}
     </update>
+
+    <!--   在当前组织下，发布的话题总数，也可以单独筛选党员 -->
+    <select id="getAgencyPartyTopicTotal" parameterType="map" resultType="java.lang.Integer">
+        SELECT
+            count( 1 ) AS total
+        FROM
+            fact_origin_topic_main_daily m
+        WHERE
+            m.DEL_FLAG = '0'
+            <if test='null !=createTopicUserIsParty and ""!=createTopicUserIsParty'>
+                AND m.CREATE_TOPIC_USER_IS_PARTY = #{createTopicUserIsParty}
+            </if>
+            AND m.CUSTOMER_ID = #{customerId}
+            AND m.PIDS LIKE CONCAT(#{agencyPath},'%')
+    </select>
 </mapper>