治理指数网格v2.1

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java

@@ -129,11 +129,32 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity {
      */
 	private Integer inGroupTopicUnResolvedCount;
 
-    /**
+	/**
-     * 11、未出当前网格的，结案项目数
+	 * 11、来源于议题的项目，未出网格结案并且已解决的项目数
-     */
+	 */
+	private Integer fromIssueResolvedInGridCount;
+
+	/**
+	 * 12、来源于议题的项目，未出网格结案并且无需解决的项目数
+	 */
+	private Integer fromIssueUnResolvedInGridCount;
+
+	/**
+	 * 13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
+	 */
+	private Integer fromAgencyResolvedInGridCount;
+
+	/**
+	 * 14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0
+	 */
+	private Integer fromAgencyUnResolvedInGridCount;
+
+	/**
+	 * 15、未出当前网格的，结案项目数=11+12+13+14
+	 */
 	private Integer gridSelfGovernProjectTotal;
 
+
 	public FactGridGovernDailyEntity() {
 		this.customerId = StrConstant.EPMETY_STR;
 		this.dateId = StrConstant.EPMETY_STR;
@@ -153,6 +174,10 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity {
 		this.approvalProjectUnResolvedCount=NumConstant.ZERO;
 		this.inGroupTopicResolvedCount=NumConstant.ZERO;
 		this.inGroupTopicUnResolvedCount=NumConstant.ZERO;
+		this.fromIssueResolvedInGridCount=NumConstant.ZERO;
+		this.fromIssueUnResolvedInGridCount=NumConstant.ZERO;
+		this.fromAgencyResolvedInGridCount=NumConstant.ZERO;
+		this.fromAgencyUnResolvedInGridCount=NumConstant.ZERO;
 		this.gridSelfGovernProjectTotal=NumConstant.ZERO;
 	}
 }

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

@@ -92,14 +92,17 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
         NumberFormat numberFormat = NumberFormat.getInstance();
         numberFormat.setMaximumFractionDigits(NumConstant.SIX);
 
-        Map<String, Integer> topicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ZERO_STR);
+        Map<String, Integer> topicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,null);
-        Map<String, Integer> topicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ZERO_STR);
+        Map<String, Integer> topicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,null);
         Map<String, Integer> issueResolvedMap=getIssueMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED);
         Map<String, Integer> issueUnResolvedMap=getIssueMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED);
         Map<String,Integer>  issueProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.RESOLVED);
         Map<String,Integer>  issueProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.UNRESOLVED);
         Map<String,Integer>  approvalProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.RESOLVED);
         Map<String,Integer>  approvalProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.UNRESOLVED);
+        Map<String, Integer> inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ONE_STR);
+        Map<String, Integer> inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ONE_STR);
+
 
         for(FactGridGovernDailyEntity insertEntity:insertEntityList){
             //1、当前网格内，话题关闭已解决数
@@ -110,6 +113,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
             if(topicUnResolvedMap.containsKey(insertEntity.getGridId())){
                 insertEntity.setTopicUnResolvedCount(topicUnResolvedMap.get(insertEntity.getGridId()));
             }
+
+
             //3、当前网格内，议题关闭已解决数
             if(issueResolvedMap.containsKey(insertEntity.getGridId())){
                 insertEntity.setIssueResolvedCount(issueResolvedMap.get(insertEntity.getGridId()));
@@ -118,6 +123,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
             if(issueUnResolvedMap.containsKey(insertEntity.getGridId())){
                 insertEntity.setIssueUnResolvedCount(issueUnResolvedMap.get(insertEntity.getGridId()));
             }
+
+
             // 5、当前网格内：来源于议题的项目：结案已解决数
             if(issueProjectResolvedMap.containsKey(insertEntity.getGridId())){
                 insertEntity.setIssueProjectResolvedCount(issueProjectResolvedMap.get(insertEntity.getGridId()));
@@ -135,13 +142,29 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                 insertEntity.setApprovalProjectUnResolvedCount(approvalProjectUnResolvedMap.get(insertEntity.getGridId()));
             }
 
-            // todo
+            // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
             // 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
-            insertEntity.setInGroupTopicResolvedCount(calInGroupTopicResolvedCount(customerId,insertEntity.getGridId()));
+            if(inGroupTopicResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setInGroupTopicResolvedCount(inGroupTopicResolvedMap.get(insertEntity.getGridId()));
+            }
             // 10、当前网格内，未出小组即未转议题的：话题关闭无需解决数
-            insertEntity.setInGroupTopicUnResolvedCount(calInGroupTopicUnResolvedCount(customerId,insertEntity.getGridId()));
+            if(inGroupTopicUnResolvedMap.containsKey(insertEntity.getGridId())){
-            // 11、未出当前网格的，结案项目数
+                insertEntity.setInGroupTopicUnResolvedCount(inGroupTopicUnResolvedMap.get(insertEntity.getGridId()));
-            insertEntity.setGridSelfGovernProjectTotal(calGridSelfGovernProjectTotal(customerId,insertEntity.getGridId()));
+            }
+
+            // todo
+            // 11、来源于议题的项目，未出网格结案并且已解决的项目数
+            insertEntity.setFromIssueResolvedInGridCount(0);
+            // 12、来源于议题的项目，未出网格结案并且无需解决的项目数
+            insertEntity.setFromIssueUnResolvedInGridCount(0);
+            // 13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
+            insertEntity.setFromAgencyResolvedInGridCount(0);
+            // 14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0
+            insertEntity.setFromAgencyUnResolvedInGridCount(0);
+            // 所有网格内结案项目数（未出网格）=来源于议题的项目结案已解决+来源于议题的项目结案无需解决+来源于立项的项目结案已解决+来源于立项的项目结案无需解决
+            // 15、未出当前网格的，结案项目数=11+12+13+14
+            insertEntity.setGridSelfGovernProjectTotal(insertEntity.getFromIssueResolvedInGridCount()+insertEntity.getFromIssueUnResolvedInGridCount()+
+                        insertEntity.getFromAgencyResolvedInGridCount()+insertEntity.getFromAgencyUnResolvedInGridCount());
 
 
             //界面展示：1、问题解决总数=1+2+3+4+5+6+7+8
@@ -150,6 +173,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                                     +insertEntity.getIssueProjectResolvedCount()+insertEntity.getIssueProjectUnResolvedCount()
                                     +insertEntity.getApprovalProjectResolvedCount()+insertEntity.getApprovalProjectUnResolvedCount());
 
+            // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
             //界面展示：2、党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数
             int groupSelfGovernRatioFz=insertEntity.getInGroupTopicResolvedCount()+insertEntity.getInGroupTopicUnResolvedCount();
             if (NumConstant.ZERO == groupSelfGovernRatioFz || NumConstant.ZERO == insertEntity.getProblemResolvedCount()) {
@@ -159,6 +183,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                 insertEntity.setGroupSelfGovernRatio(new BigDecimal(groupSelfGovernRatioStr));
             }
 
+            // 网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
             //界面展示：3、网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数
             if(NumConstant.ZERO==insertEntity.getGridSelfGovernProjectTotal()||NumConstant.ZERO == insertEntity.getProblemResolvedCount()){
                 insertEntity.setGridSelfGovernRatio(BigDecimal.ZERO);
@@ -265,32 +290,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
     }
 
 
-
-
-    /**
-     * 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
-     *
-     * @param customerId
-     * @param gridId
-     */
-    private Integer calInGroupTopicResolvedCount(String customerId, String gridId) {
-        // todo
-        return 0;
-    }
-
-    /**
-     * 10、当前网格内，未出小组即未转议题的：话题关闭无需解决数
-     *
-     * @param customerId
-     * @param gridId
-     */
-    private Integer calInGroupTopicUnResolvedCount(String customerId, String gridId) {
-        // todo
-        return 0;
-    }
-
     /**
-     * 11、未出当前网格的，结案项目数
+     * 15、未出当前网格的，结案项目数=11+12+13+14
      *
      * @param customerId
      * @param gridId

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql

@@ -64,34 +64,38 @@
 -- -- Table structure for fact_grid_govern_daily
 -- -- ----------------------------
 -- DROP TABLE IF EXISTS `fact_grid_govern_daily`;
--- CREATE TABLE `fact_grid_govern_daily`  (
+-- CREATE TABLE `fact_grid_govern_daily` (
---   `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键，customer_id+grid_id+date_id只有一条记录',
+--   `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+grid_id+date_id只有一条记录',
---   `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+--   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
---   `DATE_ID` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据更新至：yyyyMMdd; ',
+--   `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ',
---   `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格id',
+--   `GRID_ID` varchar(64) NOT NULL COMMENT '网格id',
---   `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格所属的组织id',
+--   `PID` varchar(64) NOT NULL COMMENT '网格所属的组织id',
---   `PIDS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格所有上级id',
+--   `PIDS` varchar(255) NOT NULL COMMENT '网格所有上级id',
---   `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8',
+--   `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8',
---   `GROUP_SELF_GOVERN_RATIO` decimal(10, 6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数',
+--   `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数',
---   `GRID_SELF_GOVERN_RATIO` decimal(10, 6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
+--   `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
---   `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '1、当前网格内，话题关闭已解决数',
+--   `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前网格内，话题关闭已解决数',
---   `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '2、当前网格内，话题关闭无需解决数',
+--   `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前网格内，话题关闭无需解决数',
---   `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '3、当前网格内，议题关闭已解决数',
+--   `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前网格内，议题关闭已解决数',
---   `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '4、当前网格内，议题关闭无需解决数',
+--   `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前网格内，议题关闭无需解决数',
---   `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '5、当前网格内：来源于议题的项目：结案已解决数',
+--   `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前网格内：来源于议题的项目：结案已解决数',
---   `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '6、当前网格内：来源于议题的项目：结案无需解决数',
+--   `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前网格内：来源于议题的项目：结案无需解决数',
---   `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '7、当前网格内：项目立项，结案已解决数；默认为0，',
+--   `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前网格内：项目立项，结案已解决数；默认为0，',
---   `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '8、当前网格内：项目立项，结案无需解决数；默认为0，',
+--   `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前网格内：项目立项，结案无需解决数；默认为0，',
---   `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '9、当前网格内，未出小组即未转议题的：话题关闭已解决数',
+--   `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前网格内，未出小组即未转议题的：话题关闭已解决数',
---   `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '10、当前网格内，未出小组即未转议题的：话题关闭无需解决数',
+--   `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前网格内，未出小组即未转议题的：话题关闭无需解决数',
---   `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL COMMENT '11、未出当前网格的，结案项目数',
+--   `FROM_ISSUE_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '11、来源于议题的项目，未出网格结案并且已解决的项目数',
---   `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+--   `FROM_ISSUE_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '12、来源于议题的项目，未出网格结案并且无需解决的项目数',
---   `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+--   `FROM_AGENCY_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0',
---   `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+--   `FROM_AGENCY_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0',
---   `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致',
+--   `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL COMMENT '15、未出当前网格的，结案项目数=11+12+13+14',
---   `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+--   `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
---   `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+--   `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+--   `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+--   `CREATED_TIME` datetime NOT NULL COMMENT '创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致',
+--   `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+--   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
 --   PRIMARY KEY (`ID`) USING BTREE
--- ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '网格的治理指数，按天统计' ROW_FORMAT = Dynamic;
+-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='网格的治理指数，按天统计';
 --
 -- SET FOREIGN_KEY_CHECKS = 1;