From 0f3a2f46f95cf79854d5b7c5076bbde6040f2a67 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 8 Jul 2021 16:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98-=E5=85=88=E9=94=8B=E6=A8=A1?=
 =?UTF-8?q?=E8=8C=83=E6=8A=BD=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginIssueMainDailyDao.java  |  4 +-
 .../FactOriginProjectMainDailyDao.java        |  4 +-
 .../screen/ScreenPioneerDataEntity.java       |  2 +-
 .../FactOriginIssueMainDailyService.java      |  3 +-
 .../FactOriginProjectMainDailyService.java    |  3 +-
 .../FactOriginIssueMainDailyServiceImpl.java  |  5 +-
 ...FactOriginProjectMainDailyServiceImpl.java |  5 +-
 .../impl/PioneerDataExtractServiceImpl.java   | 78 +++++++++++--------
 .../extract/FactOriginIssueMainDailyDao.xml   |  3 +
 .../extract/FactOriginProjectMainDailyDao.xml |  3 +
 10 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
index 2c2ce01d8f..42e671c2b7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
@@ -186,12 +186,14 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
      * @return java.lang.Integer
      * @param customerId
      * @param agencyPath
+     * @param topicUserIsParty 创建话题用户身份标识。1:党员，0:非党员
      * @author yinzuomei
      * @description 组织下：议题转项目数
      * @Date 2020/9/24 17:05
      **/
     Integer getAgencyShiftProjectTotal(@Param("customerId")String customerId,
-                                       @Param("agencyPath")String agencyPath);
+                                       @Param("agencyPath")String agencyPath,
+                                       @Param("topicUserIsParty")String topicUserIsParty);
 
     /**
      * 网格内议题总数
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
index d6766bf966..7e8311778c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
@@ -140,6 +140,7 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
      * @param agencyPath
 	 * @param closedStatus :resolved   unresolved
 	 * @param projectStatus :pending closed
+	 * @param isParty 是否是党员 1:是
      * @author yinzuomei
      * @description 组织下：已解决项目  or  已结案项目总数
      * @Date 2020/9/24 17:38
@@ -147,7 +148,8 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	int getAgencyClosedProjectTotal(@Param("customerId") String customerId,
 									@Param("agencyPath")String agencyPath,
 									@Param("closedStatus")String closedStatus,
-									@Param("projectStatus") String projectStatus);
+									@Param("projectStatus") String projectStatus,
+									@Param("isParty") String isParty);
 
 	/**
 	 * 组织自治项目数
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPioneerDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPioneerDataEntity.java
index 8f905fe67c..88977c1ff8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPioneerDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPioneerDataEntity.java
@@ -98,7 +98,7 @@ public class ScreenPioneerDataEntity extends BaseEpmetEntity {
 	private Integer publishIssueTotal;
 
 	/**
-	 * 3.2当前组织维度，发布议题总数，PUBLISH_ISSUE_RATIO的分母，SHIFT_PROJECT_RATIO的分母
+	 * 3.2当前组织维度，发布议题总数，PUBLISH_ISSUE_RATIO的分母
 	 */
 	private Integer platPublishIssueTotal;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
index 5b6980acd8..f6e49aaeb5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
@@ -89,11 +89,12 @@ public interface FactOriginIssueMainDailyService extends BaseService<FactOriginI
      * @return java.lang.Integer
      * @param customerId
      * @param agencyPath
+     * @param topicUserIsParty 创建话题用户身份标识。1:党员，0:非党员
      * @author yinzuomei
      * @description 组织下：议题转项目数
      * @Date 2020/9/24 17:04
      **/
-    Integer getAgencyShiftProjectTotal(String customerId, String agencyPath);
+    Integer getAgencyShiftProjectTotal(String customerId, String agencyPath,String topicUserIsParty);
 
     /**
      * 网格内议题数
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
index a46a7ab67f..056de60e3e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
@@ -133,11 +133,12 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @param agencyPath
      * @param closedStatus :resolved   unresolved
      * @param projectStatus :pending closed
+     * @param isParty 是否是党员 1:是
      * @author yinzuomei
      * @description 组织下：已解决项目  or  已结案项目总数
      * @Date 2020/9/24 17:37
      **/
-    int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus,String projectStatus);
+    int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus,String projectStatus,String isParty);
 
     /**
      * 自治项目数
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
index a05372a67b..8906530ae8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
@@ -121,14 +121,15 @@ public class FactOriginIssueMainDailyServiceImpl extends BaseServiceImpl<FactOri
     /**
      * @param customerId
      * @param agencyPath
+     * @param topicUserIsParty 创建话题用户身份标识。1:党员，0:非党员
      * @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);
+    public Integer getAgencyShiftProjectTotal(String customerId, String agencyPath,String topicUserIsParty) {
+        return baseDao.getAgencyShiftProjectTotal(customerId,agencyPath,topicUserIsParty);
     }
 
     @Override
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
index f757b952c9..0c65560d2e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
@@ -167,14 +167,15 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
      * @param agencyPath
      * @param closedStatus :resolved   unresolved
      * @param projectStatus :pending closed
+     * @param isParty 是否是党员 1:是
      * @return int
      * @author yinzuomei
      * @description 组织下：已解决项目  or  已结案项目总数
      * @Date 2020/9/24 17:37
      **/
     @Override
-    public int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus,String projectStatus) {
-        return baseDao.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus,projectStatus);
+    public int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus,String projectStatus,String isParty) {
+        return baseDao.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus,projectStatus,isParty);
     }
 
     @Override
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PioneerDataExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PioneerDataExtractServiceImpl.java
index b25c61cdf2..65e4cd4669 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PioneerDataExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PioneerDataExtractServiceImpl.java
@@ -106,7 +106,7 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             //当前网格内所有议题总数
             int gridIssueTotal = getGridOrCommunityIssueTotal(customerId, gridId, null,StrConstant.EPMETY_STR);
             log.info("extractGridPioneerData 当前网格id=" + gridId + ";当前网格内所有议题总数=" + gridIssueTotal);
-            // 3.2当前组织维度，发布议题总数，PUBLISH_ISSUE_RATIO的分母，SHIFT_PROJECT_RATIO的分母
+            // 3.2当前组织维度，发布议题总数，PUBLISH_ISSUE_RATIO的分母
             entity.setPlatPublishIssueTotal(gridIssueTotal);
 
             //当前网格内，议题已经转为项目的总数
@@ -114,7 +114,7 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             // 4.2当前组织维度，已经转为项目的议题总数，SHIFT_PROJECT_RATIO的分母
             entity.setPlatShiftProjectTotal(gridIssueToProjectTotal);
 
-            if (gridIssueTotal != NumConstant.ZERO) {
+            if (gridIssueTotal != NumConstant.ZERO && gridIssueToProjectTotal !=NumConstant.ZERO) {
                 // 3.1党员发布议题总数：话题发布人是党员
                 entity.setPublishIssueTotal(getParyPublishIssueTotal(customerId, gridId, null));
                 log.info("extractGridPioneerData 当前网格id=" + gridId + ";党员发布议题publishIssueTotal"+entity.getPublishIssueTotal());
@@ -248,14 +248,16 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
                 entity.setTopicRatio(communityTopicTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getTopicTotal() / communityTopicTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }
 
-            //3.2当前组织维度，发布议题总数，PUBLISH_ISSUE_RATIO的分母，SHIFT_PROJECT_RATIO的分母
+            //3.2当前组织维度，发布议题总数，PUBLISH_ISSUE_RATIO的分母
             int communityIssueTotal = getGridOrCommunityIssueTotal(customerId, null, communityId,StrConstant.EPMETY_STR);
             log.info("extractCommunityPioneerData 当前communityId="+communityId+";当前社区内所有议题总数communityIssueTotal="+communityIssueTotal);
             entity.setPlatPublishIssueTotal(communityIssueTotal);
 
             int communityIssueToProjectTotal = getGridOrCommunityIssueTotal(customerId, null, communityId,IssueConstant.SHIFT_PROJECT);
+            //4.2当前组织维度，已经转为项目的议题总数，SHIFT_PROJECT_RATIO的分母.0708新增此列
+            entity.setPlatShiftProjectTotal(communityIssueToProjectTotal);
 
-            if (communityIssueTotal != NumConstant.ZERO) {
+            if (communityIssueTotal != NumConstant.ZERO && communityIssueToProjectTotal != NumConstant.ZERO) {
                 //3.1党员发布议题总数：话题发布人是党员
                 entity.setPublishIssueTotal(getParyPublishIssueTotal(customerId, null, communityId));
                 log.info("extractCommunityPioneerData 当前communityId="+communityId+";党员发布议题publishIssueTotal="+entity.getPublishIssueTotal());
@@ -270,7 +272,7 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
                 entity.setShiftProjectTotal(getGridOrCommunityShiftProjectTotal(customerId, null, communityId,NumConstant.ONE_STR));
                 log.info("extractCommunityPioneerData 当前communityId="+communityId+";党员议题转项目数shiftProjectTotal="+entity.getShiftProjectTotal());
 
-                //8、议题转项目占比 : 占社区内议题转项目总数的比率
+                //4.3议题转项目占比
                 entity.setShiftProjectRatio(entity.getShiftProjectTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getShiftProjectTotal() / communityIssueToProjectTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }else{
                 log.info("extractCommunityPioneerData 当前communityId="+communityId+"communityIssueTotal =0");
@@ -281,20 +283,20 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             }
 
 
-            // 9、党员已解决项目总数
+            // 5.1党员解决项目总数：话题发布人是党员的议题，转为项目并且已经解决
             entity.setResolvedProjectTotal(getGridOrCommunityClosedProjectTotal(customerId, null, communityId, DimObjectStatusConstant.RESOLVED, ProjectConstant.CLOSED, NumConstant.ONE_STR));
             log.info("extractCommunityPioneerData 当前communityId="+communityId+";已解决项目resolvedProjectTotal="+entity.getResolvedProjectTotal());
 
-            //01.12新增
-            //已解决项目总数
+            // 5.2当前组织维度，所有结案项目数，RESOLVED_PROJECT_RATIO的分母
             int closedProjectTotal = getGridOrCommunityClosedProjectTotal(customerId, null, communityId, null,ProjectConstant.CLOSED,StrConstant.EPMETY_STR);
             log.info("extractCommunityPioneerData 当前communityId="+communityId+";总结项目closedProjectTotal="+closedProjectTotal);
             entity.setPlatClosedProjectTotal(closedProjectTotal);
 
+            //5.3解决项目总数占比
             if (entity.getResolvedProjectTotal() == NumConstant.ZERO) {
                 entity.setResolvedProjectRatio(BigDecimal.ZERO);
             } else {
-                // 10、占总结项目
+                // 5.3解决项目总数占比
                 entity.setResolvedProjectRatio(closedProjectTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getResolvedProjectTotal() / closedProjectTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }
 
@@ -327,60 +329,66 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
                 entity.setAgencyPath(entity.getAgencyPids().concat(StrConstant.COLON).concat(entity.getOrgId()));
             }
             log.info("extractExceptCommunityPioneerData 当前orgId="+entity.getOrgId()+";agencyPath="+entity.getAgencyPath());
-            //1、党员参与议事
+            //1.1党员参与议事：何为参与？议题的表决行为次数总计
             entity.setIssueTotal(calPartyPartiIssueTotal(customerId,null,null,entity.getAgencyPath(),NumConstant.ONE_STR));
             log.info("extractExceptCommunityPioneerData 党员参与议事issueTotal="+entity.getIssueTotal());
 
-            //01.12新增
+            //1.2平台参与议事总数
             int issueTotal=calPartyPartiIssueTotal(customerId,null,null,entity.getAgencyPath(),null);
             log.info("extractExceptCommunityPioneerData 平台参与议事issueTotal="+issueTotal);
             entity.setPlatIssueTotal(issueTotal);
 
+            //1.3党员参与议事占比=issue_total/plat_issue_total
             if(entity.getIssueTotal()==0){
                 entity.setIssueRatio(BigDecimal.ZERO);
             }else{
-                //2、党员参与议事占比
                 entity.setIssueRatio(new BigDecimal((double)entity.getIssueTotal()/issueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX,RoundingMode.HALF_UP));
             }
 
-            //3、党员发布话题:
+            //2.1党员发布话题
             entity.setTopicTotal(getAgencyTopicTotal(customerId, entity.getAgencyPath(),NumConstant.ONE_STR));
             log.info("extractExceptCommunityPioneerData 党员发布话题topicTotal="+entity.getTopicTotal());
 
-            //01.12新增
-            //当前组织内所有话题总数
+            //2.2当前组织维度，话题总数,TOPIC_RATIO的分母
             int agencyTopicTotal = getAgencyTopicTotal(customerId, entity.getAgencyPath(),null);
             log.info("extractExceptCommunityPioneerData 当前组织内所有话题总数agencyTopicTotal="+agencyTopicTotal);
             entity.setPlatTopicTotal(agencyTopicTotal);
 
-            //4、党员发布话题占比: 组织内注册党员发布的话题总数占  组织内话题总数的 比率
+            //2.3党员发布话题占比
             if (entity.getTopicTotal() == NumConstant.ZERO) {
                 entity.setTopicRatio(BigDecimal.ZERO);
             } else {
                 entity.setTopicRatio(agencyTopicTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getTopicTotal() / agencyTopicTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }
 
-            //01.12新增
-            //当前组织内所有议题总数
+            //3.2当前组织维度，发布议题总数，PUBLISH_ISSUE_RATIO的分母
             int agencyIssueTotal = getAgencyIssueTotal(customerId, entity.getAgencyPath());
             log.info("extractExceptCommunityPioneerData 当前组织内所有议题总数agencyIssueTotal="+agencyIssueTotal);
             entity.setPlatPublishIssueTotal(agencyIssueTotal);
 
-            if (agencyIssueTotal != NumConstant.ZERO) {
-                //5、党员发布议题
+            //4.2当前组织维度，已经转为项目的议题总数，SHIFT_PROJECT_RATIO的分母.0708新增此列
+            int platShiftProjectTotal=getAgencyShiftProjectTotal(customerId, entity.getAgencyPath(),StrConstant.EPMETY_STR);
+            entity.setPlatShiftProjectTotal(platShiftProjectTotal);
+
+            if (agencyIssueTotal != NumConstant.ZERO && platShiftProjectTotal != NumConstant.ZERO) {
+                //3.1党员发布议题总数：话题发布人是党员
                 entity.setPublishIssueTotal(getAgencyParyPublishIssueTotal(customerId, entity.getAgencyPath()));
                 log.info("extractExceptCommunityPioneerData 党员发布议题publishIssueTotal="+entity.getPublishIssueTotal());
-                //6、党员发布议题占比 :  占社区内所有议题的比率
+
+                //3.3党员发布议题占比
                 if (entity.getPublishIssueTotal() == NumConstant.ZERO) {
                     entity.setPublishIssueRatio(BigDecimal.ZERO);
                 }
                 entity.setPublishIssueRatio(agencyIssueTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getPublishIssueTotal() / agencyIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
 
-                //7、议题转项目数
-                entity.setShiftProjectTotal(getAgencyShiftProjectTotal(customerId, entity.getAgencyPath()));
+                //4.1党员议题转项目数：话题发布人党员+已经转为项目的议题总数
+                entity.setShiftProjectTotal(getAgencyShiftProjectTotal(customerId, entity.getAgencyPath(),NumConstant.ONE_STR));
                 log.info("extractExceptCommunityPioneerData 议题转项目数shiftProjectTotal="+entity.getShiftProjectTotal());
-                //8、议题转项目占比 : 占网格内议题总数的比率
-                entity.setShiftProjectRatio(entity.getShiftProjectTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getShiftProjectTotal() / agencyIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+
+                //4.3议题转项目占比
+                entity.setShiftProjectRatio(entity.getShiftProjectTotal() == NumConstant.ZERO ?
+                        BigDecimal.ZERO :
+                        new BigDecimal((double)entity.getShiftProjectTotal() / agencyIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }else{
                 log.info("extractExceptCommunityPioneerData 当前组织内所有议题总数agencyIssueTotal=0");
                 entity.setPublishIssueTotal(NumConstant.ZERO);
@@ -390,19 +398,21 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             }
 
 
-            // 9、已解决项目
-            entity.setResolvedProjectTotal(getAgencyClosedProjectTotal(customerId, entity.getAgencyPath(), DimObjectStatusConstant.RESOLVED));
+            // 5.1党员解决项目总数：话题发布人是党员的议题，转为项目并且已经解决
+            entity.setResolvedProjectTotal(getAgencyClosedProjectTotal(customerId, entity.getAgencyPath(), DimObjectStatusConstant.RESOLVED,NumConstant.ONE_STR));
             log.info("extractExceptCommunityPioneerData 已解决项目resolvedProjectTotal="+entity.getResolvedProjectTotal());
 
-            //01.12新增
-            int closedProjectTotal = getAgencyClosedProjectTotal(customerId, entity.getAgencyPath(), null);
+            //5.2当前组织维度，所有结案项目数，RESOLVED_PROJECT_RATIO的分母
+            int closedProjectTotal = getAgencyClosedProjectTotal(customerId, entity.getAgencyPath(), null,StrConstant.EPMETY_STR);
             log.info("extractExceptCommunityPioneerData 总结项目closedProjectTotal="+closedProjectTotal);
             entity.setPlatClosedProjectTotal(closedProjectTotal);
 
+            //5.3解决项目总数占比
             if (entity.getResolvedProjectTotal() == NumConstant.ZERO) {
+                //5.3解决项目总数占比
                 entity.setResolvedProjectRatio(BigDecimal.ZERO);
             } else {
-                // 10、占总结项目
+                // 5.3解决项目总数占比
                 entity.setResolvedProjectRatio(closedProjectTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getResolvedProjectTotal() / closedProjectTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }
 
@@ -422,13 +432,13 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
     }
 
     //组织下：已解决项目  or  已结案项目总数
-    private int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus) {
-        return factOriginProjectMainDailyService.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus, ProjectConstant.CLOSED);
+    private int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus,String isParty) {
+        return factOriginProjectMainDailyService.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus, ProjectConstant.CLOSED,isParty);
     }
 
     //组织下：议题转项目数
-    private Integer getAgencyShiftProjectTotal(String customerId, String agencyPath) {
-        return factOriginIssueMainDailyService.getAgencyShiftProjectTotal(customerId,agencyPath);
+    private Integer getAgencyShiftProjectTotal(String customerId, String agencyPath,String topicUserIsParty) {
+        return factOriginIssueMainDailyService.getAgencyShiftProjectTotal(customerId,agencyPath,topicUserIsParty);
     }
 
     //组织内： 党员发布议题
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
index 8bca7be59f..9c42712164 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
@@ -272,6 +272,9 @@
             AND t1.ISSUE_STATUS = 'shift_project'
             AND t1.CUSTOMER_ID = #{customerId}
             and t1.PIDS LIKE CONCAT(#{agencyPath},'%')
+            <if test='null != topicUserIsParty and ""!=topicUserIsParty'>
+                and t1.TOPIC_USER_IS_PARTY = #{topicUserIsParty}
+            </if>
     </select>
     <select id="selectGridIssueCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
index 5ec1c46799..11ce137aab 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
@@ -192,6 +192,9 @@
             <if test='null != projectStatus and "" != projectStatus'>
                 and t1.PROJECT_STATUS=#{projectStatus}
             </if>
+            <if test='null != isParty and "" != isParty'>
+                and t1.IS_PARTY=#{isParty}
+            </if>
     </select>
     <select id="getSelfProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT