Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactAgencyGovernDailyEntity.java

@@ -187,5 +187,13 @@ public class FactAgencyGovernDailyEntity extends BaseEpmetEntity {
 	 * 18、当前组织内：来源于工作人员上报事件的项目：结案无需解决数
 	 */
 	private Integer workEventUnResolvedCount;
+	/**
+	 * 19、当前组织内：来源于事件管理的项目：结案已解决数
+	 */
+	private Integer icEventResolvedCount;
+	/**
+	 * 20、当前组织内：来源于事件管理的项目：结案无需解决数
+	 */
+	private Integer icEventUnResolvedCount;
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1201,9 +1201,12 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
                     Integer eventUnResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getEventUnResolvedCount).sum();
                     Integer workEventResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getWorkEventResolvedCount).sum();
                     Integer workEventUnResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getWorkEventUnResolvedCount).sum();
+                    Integer icEventResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getIcEventResolvedCount).sum();
+                    Integer icEventUnResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getIcEventUnResolvedCount).sum();
                     Integer closedProjectTotal = issueResolvedCount + issueUnResolvedCount+projectResolvedCount
                                                 + projectUnResolvedCount + eventResolvedCount + eventUnResolvedCount
-                                            + workEventResolvedCount + workEventUnResolvedCount;
+                                            + workEventResolvedCount + workEventUnResolvedCount
+                            +icEventResolvedCount + icEventUnResolvedCount;
                     resultDTO.setProblemResolvedCount(closedProjectTotal);
                     resultDTO.setGroupSelfGovernRatio(getPercentage(inGroupTopicResolvedCount + inGroupTopicUnResolvedCount, problemResolvedCount));
                     resultDTO.setGridSelfGovernRatio(getPercentage(gridSelfGovernProjectTotal, closedProjectTotal));

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -631,7 +631,8 @@
             ISSUE_PROJECT_RESOLVED_COUNT+ISSUE_PROJECT_UN_RESOLVED_COUNT
             +APPROVAL_PROJECT_RESOLVED_COUNT+APPROVAL_PROJECT_UN_RESOLVED_COUNT
             +EVENT_RESOLVED_COUNT+EVENT_UN_RESOLVED_COUNT
-            +WORK_EVENT_RESOLVED_COUNT+WORK_EVENT_UN_RESOLVED_COUNT AS problemResolvedCount,
+            +WORK_EVENT_RESOLVED_COUNT+WORK_EVENT_UN_RESOLVED_COUNT
+            +IC_EVENT_RESOLVED_COUNT+IC_EVENT_UN_RESOLVED_COUNT AS problemResolvedCount,
             concat(ROUND(group_self_govern_ratio*100, 1),'%') AS groupSelfGovernRatio,
             concat(ROUND(grid_self_govern_ratio*100, 1),'%') AS gridSelfGovernRatio,
             concat(ROUND(community_closed_ratio*100, 1),'%') AS communityResolvedRatio,
@@ -654,7 +655,8 @@
             ISSUE_PROJECT_RESOLVED_COUNT+ISSUE_PROJECT_UN_RESOLVED_COUNT
             +APPROVAL_PROJECT_RESOLVED_COUNT+APPROVAL_PROJECT_UN_RESOLVED_COUNT
             +EVENT_RESOLVED_COUNT+EVENT_UN_RESOLVED_COUNT
-            +WORK_EVENT_RESOLVED_COUNT+WORK_EVENT_UN_RESOLVED_COUNT AS problemResolvedCount,
+            +WORK_EVENT_RESOLVED_COUNT+WORK_EVENT_UN_RESOLVED_COUNT
+            +IC_EVENT_RESOLVED_COUNT+IC_EVENT_UN_RESOLVED_COUNT AS problemResolvedCount,
             concat(ROUND(group_self_govern_ratio*100, 1),'%') AS groupSelfGovernRatio,
             concat(ROUND(grid_self_govern_ratio*100, 1),'%') AS gridSelfGovernRatio,
             concat(ROUND(community_closed_ratio*100, 1),'%') AS communityResolvedRatio,
@@ -693,7 +695,9 @@
             EVENT_RESOLVED_COUNT,
             EVENT_UN_RESOLVED_COUNT,
             WORK_EVENT_RESOLVED_COUNT,
-            WORK_EVENT_UN_RESOLVED_COUNT
+            WORK_EVENT_UN_RESOLVED_COUNT,
+            IC_EVENT_RESOLVED_COUNT,
+            IC_EVENT_UN_RESOLVED_COUNT
         FROM
             fact_agency_govern_daily
         WHERE

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactAgencyGovernDailyDTO.java

@@ -147,6 +147,16 @@ public class FactAgencyGovernDailyDTO implements Serializable {
 	 */
 	private Integer workEventUnResolvedCount;
 
+	/**
+	 * 19、当前组织内：来源于事件管理的项目：结案已解决数
+	 */
+	private Integer icEventResolvedCount;
+
+	/**
+	 * 20、当前组织内：来源于事件管理的项目：结案无需解决数
+	 */
+	private Integer icEventUnResolvedCount;
+
 	/**
 	 * 未出当前网格的，结案项目数
 	 */

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactGridGovernDailyDTO.java

@@ -158,6 +158,16 @@ public class FactGridGovernDailyDTO implements Serializable {
 	 */
 	private Integer workEventUnResolvedCount;
 
+	/**
+	 * 19、当前组织内：来源于事件管理的项目：结案已解决数
+	 */
+	private Integer icEventResolvedCount;
+
+	/**
+	 * 20、当前组织内：来源于事件管理的项目：结案无需解决数
+	 */
+	private Integer icEventUnResolvedCount;
+
 	/**
 	 * 15、未出当前网格的，结案项目数=11+12+13+14
 	 */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java

@@ -85,6 +85,8 @@ public interface ProjectConstant {
     String PROJECT_ORIGIN_EVENT="resi_event";
 
     String PROJECT_ORIGIN_WORK_EVENT="work_event";
+
+    String IC_EVENT="ic_event";
     /**
      * 自办
      */

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

@@ -186,4 +186,14 @@ public class FactAgencyGovernDailyEntity extends BaseEpmetEntity {
      */
 	private Integer districtDeptClosedCount;
 
+	/**
+	 * 19、当前组织内：来源于事件管理的项目：结案已解决数
+	 */
+	private Integer icEventResolvedCount;
+	/**
+	 * 20、当前组织内：来源于事件管理的项目：结案无需解决数
+	 */
+	private Integer icEventUnResolvedCount;
+
+
 }

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

@@ -186,6 +186,16 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity {
 	 */
 	private Integer workEventUnResolvedCount;
 
+	/**
+	 * 19、当前组织内：来源于事件管理的项目：结案已解决数
+	 */
+	private Integer icEventResolvedCount;
+
+	/**
+	 * 20、当前组织内：来源于事件管理的项目：结案无需解决数
+	 */
+	private Integer icEventUnResolvedCount;
+
 
 	/**
 	 * 当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数

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

@@ -285,6 +285,32 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 			});
 		}
 
+		//2022-5-23 当前组织内：来源于事件管理的项目：结案已解决数
+		Map<String, OrgStatisticsResultDTO> icEventProjectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
+				dateId,	ProjectConstant.RESOLVED,
+				ProjectConstant.IC_EVENT);
+		if (!icEventProjectResolvedTotal.isEmpty()) {
+			agencyGovernDailyList.forEach(item -> {
+				OrgStatisticsResultDTO dto = icEventProjectResolvedTotal.get(item.getAgencyId());
+				if (null != dto) {
+					item.setIcEventResolvedCount(dto.getSum());
+				}
+			});
+		}
+		//2022-5-23 当前组织内：来源于事件管理的项目：结案无需解决数
+		Map<String, OrgStatisticsResultDTO> icEventProjectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
+				dateId,	ProjectConstant.UNRESOLVED,
+				ProjectConstant.IC_EVENT);
+		if (!icEventProjectUnResolvedTotal.isEmpty()) {
+			agencyGovernDailyList.forEach(item -> {
+				OrgStatisticsResultDTO dto = icEventProjectUnResolvedTotal.get(item.getAgencyId());
+				if (null != dto) {
+					item.setIcEventUnResolvedCount(dto.getSum());
+				}
+			});
+		}
+
+
 		// 2.党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
 		agencyGovernDailyList.forEach(item -> {
 			int count = item.getInGroupTopicResolvedCount() + item.getInGroupTopicUnResolvedCount();
@@ -423,6 +449,8 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 		entity.setEventUnResolvedCount(NumConstant.ZERO);
 		entity.setWorkEventResolvedCount(NumConstant.ZERO);
 		entity.setWorkEventUnResolvedCount(NumConstant.ZERO);
+		entity.setIcEventResolvedCount(NumConstant.ZERO);
+		entity.setIcEventUnResolvedCount(NumConstant.ZERO);
 		entity.setInGroupTopicResolvedCount(NumConstant.ZERO);
 		entity.setInGroupTopicUnResolvedCount(NumConstant.ZERO);
 		entity.setGridSelfGovernProjectTotal(NumConstant.ZERO);

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

@@ -115,6 +115,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
         Map<String,Integer>  eventProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_EVENT,DimObjectStatusConstant.UNRESOLVED);
         Map<String,Integer>  workEventProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_WORK_EVENT,DimObjectStatusConstant.RESOLVED);
         Map<String,Integer>  workEventProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_WORK_EVENT,DimObjectStatusConstant.UNRESOLVED);
+        Map<String,Integer>  icEventProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.IC_EVENT,DimObjectStatusConstant.RESOLVED);
+        Map<String,Integer>  icEventProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.IC_EVENT,DimObjectStatusConstant.UNRESOLVED);
         Map<String, Integer> inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ZERO_STR);
         Map<String, Integer> inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ZERO_STR);
         Map<String, GovernGridClosedTotalCommonDTO> dtoMap=getGovernGridClosedTotalCommonDTOMap(customerId,gridIds);
@@ -182,6 +184,16 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                 insertEntity.setWorkEventUnResolvedCount(workEventProjectUnResolvedMap.get(insertEntity.getGridId()));
             }
 
+            // 2022-5-23  当前组织内：来源于事件管理的项目：结案已解决数
+            if(icEventProjectResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setIcEventResolvedCount(icEventProjectResolvedMap.get(insertEntity.getGridId()));
+            }
+
+            // 2022-5-23  当前组织内：来源于事件管理的项目：结案无需解决数
+            if(icEventProjectUnResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setIcEventUnResolvedCount(icEventProjectUnResolvedMap.get(insertEntity.getGridId()));
+            }
+
             // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
             // 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
             if(inGroupTopicResolvedMap.containsKey(insertEntity.getGridId())){
@@ -226,7 +238,9 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                                     + insertEntity.getEventResolvedCount()
                                     + insertEntity.getEventUnResolvedCount()
                                     + insertEntity.getWorkEventResolvedCount()
-                                    + insertEntity.getWorkEventUnResolvedCount();
+                                    + insertEntity.getWorkEventUnResolvedCount()
+                                    + insertEntity.getIcEventResolvedCount()
+                                    + insertEntity.getIcEventUnResolvedCount();
             // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
             //界面展示：2、党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数
             int groupSelfGovernRatioFz=insertEntity.getInGroupTopicResolvedCount()+insertEntity.getInGroupTopicUnResolvedCount();

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

@@ -141,7 +141,7 @@
 
             WHERE
                 1 = 1
-                AND f.ORIGIN = 'issue'
+                AND f.ORIGIN IN('issue', 'ic_event')
                 AND f.PROJECT_STATUS = 'closed'
                 AND f.CUSTOMER_ID = #{customerId}
             ) a
@@ -468,7 +468,7 @@
                   AND fm.MONTH_ID = #{monthId}
                   AND fm.PROJECT_STATUS = 'closed'
                   AND fm.GRID_ID != ''
-                  AND fm.ORIGIN = 'issue'
+                  AND fm.ORIGIN IN('issue', 'ic_event')
             ) a
         GROUP BY
             GRID_ID
@@ -490,7 +490,7 @@
                 WHERE  fm.CUSTOMER_ID = #{customerId}
                     AND fm.MONTH_ID = #{monthId}
                   AND fm.PROJECT_STATUS = 'closed'
-                  AND fm.ORIGIN = 'issue'
+                  AND fm.ORIGIN IN('issue', 'ic_event')
             ) a
         GROUP BY
             AGENCY_ID
@@ -680,7 +680,7 @@
                     fm.CUSTOMER_ID = #{customerId}
                   AND fm.PROJECT_STATUS = 'closed'
                   AND fm.GRID_ID != ''
-                  AND fm.ORIGIN = 'issue'
+                  AND fm.ORIGIN IN('issue', 'ic_event')
             ) a
         GROUP BY
             GRID_ID
@@ -701,7 +701,7 @@
                     INNER JOIN fact_origin_project_main_daily fm ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
                 WHERE  fm.CUSTOMER_ID = #{customerId}
                   AND fm.PROJECT_STATUS = 'closed'
-                  AND fm.ORIGIN = 'issue'
+                  AND fm.ORIGIN IN('issue', 'ic_event')
             ) a
         GROUP BY
             AGENCY_ID

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -58,7 +58,7 @@
         FROM project
         WHERE
             DEL_FLAG = '0'
-          AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event')
+          AND ORIGIN IN('issue', 'resi_event', 'ic_event')
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
           AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') <![CDATA[ <= ]]> #{date}
@@ -72,7 +72,7 @@
         FROM project
         WHERE
             DEL_FLAG = '0'
-          AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event')
+          AND ORIGIN IN('issue', 'resi_event', 'ic_event')
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
           AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') = #{date}