基层治理-治理能力排行数据(按天统计)

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

@@ -669,6 +669,15 @@ public class DemoController {
         return new Result();
     }
 
+    @PostMapping("governRankDaily")
+    public Result governRankDaily(@RequestBody CustomerIdAndDateIdFormDTO formDTO){
+        governRankDataExtractService.extractGridDataDaily(formDTO.getCustomerId(), formDTO.getDateId());
+        governRankDataExtractService.extractCommunityDataDaily(formDTO.getCustomerId(), formDTO.getDateId());
+        governRankDataExtractService.extractStreetDataDaily(formDTO.getCustomerId(), formDTO.getDateId());
+        governRankDataExtractService.extractDistrictDataDaily(formDTO.getCustomerId(), formDTO.getDateId());
+        return new Result();
+    }
+
     @Autowired
     private PioneerDataExtractService pioneerDataExtractService;
     @Autowired

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

@@ -288,4 +288,14 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
 	 */
 	List<OrgStatisticsResultDTO> selectGridClosed(@Param("customerId") String customerId, @Param("monthId") String monthId);
+
+	/**
+	 * 网格自治率统计--按天
+	 * @author zhaoqifeng
+	 * @date 2021/5/24 17:53
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectGridSelfDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
 }

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

@@ -310,4 +310,14 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO>  getGridClosed(String customerId, String monthId);
+
+    /**
+     * 网格自制率统计-按天
+     * @author zhaoqifeng
+     * @date 2021/5/24 17:52
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getGridSelfDaily(String customerId, String dateId);
 }

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

@@ -400,5 +400,19 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
         return baseDao.selectGridClosed(customerId, monthId);
     }
 
+    /**
+     * 网格自制率统计-按天
+     *
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/24 17:52
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getGridSelfDaily(String customerId, String dateId) {
+        return baseDao.selectGridSelfDaily(customerId, dateId);
+    }
+
 
 }

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

@@ -321,12 +321,12 @@ public class GovernRankDataExtractServiceImpl implements GovernRankDataExtractSe
 			}));
 		}
 		//自治率
-		List<FactIndexGovrnAblityGridMonthlyEntity> gridList = factIndexGovrnAblityGridMonthlyService.getGridByCustomerDaily(customerId, dateId);
+		List<OrgStatisticsResultDTO> gridList = factOriginProjectLogDailyService.getGridSelfDaily(customerId, dateId);
 		if (CollectionUtils.isNotEmpty(gridList)) {
-			list.forEach(entity -> gridList.stream().filter(gridAbility -> entity.getOrgId().equals(gridAbility.getGridId())).forEach(grid -> {
-				BigDecimal resolveCount = new BigDecimal(grid.getResolveProjectCount());
-				BigDecimal selfCount = new BigDecimal(grid.getSelfSolveProjectCount());
-				if (grid.getResolveProjectCount() != NumConstant.ZERO) {
+			list.forEach(entity -> gridList.stream().filter(gridAbility -> entity.getOrgId().equals(gridAbility.getOrgId())).forEach(grid -> {
+				BigDecimal resolveCount = new BigDecimal(grid.getSum());
+				BigDecimal selfCount = new BigDecimal(grid.getCount());
+				if (grid.getSum() != NumConstant.ZERO) {
 					entity.setGovernRatio(selfCount.multiply(hundred).divide(resolveCount, NumConstant.SIX, RoundingMode.HALF_UP));
 				}
 			}));

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java

@@ -149,6 +149,7 @@ public class ScreenGovernRankDataDailyServiceImpl extends BaseServiceImpl<Screen
      * @date 2020/9/25 10:32
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delAndSaveRankData(String customerId, String orgType, String dateId, Integer deleteSize,
                                    List<ScreenGovernRankDataDailyEntity> entityList) {
         if (CollectionUtils.isEmpty(entityList)) {

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

@@ -313,8 +313,7 @@
                     COUNT( ID ) AS "count"
              FROM fact_origin_project_log_daily
              WHERE ORG_TYPE = 'grid'
-               AND ( ACTION_CODE = 'response'
-                 OR ACTION_CODE = 'close'
+               AND (ACTION_CODE = 'close'
                  OR ACTION_CODE = 'transfer'
                  OR ACTION_CODE = 'resolved'
                  OR ACTION_CODE = 'unresolved'
@@ -347,8 +346,7 @@
              INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID
                  AND da.`LEVEL` = #{level}
              WHERE
-                 ( ACTION_CODE = 'response'
-                     OR ACTION_CODE = 'close'
+                 ( ACTION_CODE = 'close'
                      OR ACTION_CODE = 'transfer'
                      OR ACTION_CODE = 'resolved'
                      OR ACTION_CODE = 'unresolved'
@@ -589,8 +587,7 @@
                       INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID
                  AND da.`LEVEL` = #{level}
              WHERE
-                 ( ACTION_CODE = 'response'
-                     OR ACTION_CODE = 'close'
+                 (ACTION_CODE = 'close'
                      OR ACTION_CODE = 'transfer'
                      OR ACTION_CODE = 'resolved'
                      OR ACTION_CODE = 'unresolved'
@@ -620,11 +617,8 @@
                     COUNT( ID ) AS "count"
              FROM fact_origin_project_log_daily
              WHERE ORG_TYPE = 'grid'
-               AND ( ACTION_CODE = 'response'
-                 OR ACTION_CODE = 'close'
+               AND ( ACTION_CODE = 'close'
                  OR ACTION_CODE = 'transfer'
-                 OR ACTION_CODE = 'resolved'
-                 OR ACTION_CODE = 'unresolved'
                  OR ACTION_CODE = 'created' )
                AND IS_ACTIVE = 1
                AND CUSTOMER_ID = #{customerId}
@@ -632,4 +626,42 @@
              GROUP BY  ORG_ID ) b
             ON a.ORG_ID = b.ORG_ID
     </select>
+    <select id="selectGridSelfDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            GRID_ID AS "orgId",
+            COUNT( ID ) AS "sum",
+            IFNULL(a.count,0) AS "count"
+        FROM
+            fact_origin_project_main_daily fm
+                LEFT JOIN (
+                SELECT
+                    orgId,
+                    COUNT( PROJECT_ID ) AS "count"
+                FROM
+                    (
+                        SELECT
+                            ORG_ID AS orgId,
+                            PROJECT_ID
+                        FROM
+                            fact_origin_project_log_daily
+                        WHERE
+                            DEL_FLAG = 0
+                          AND CUSTOMER_ID = #{customerId}
+                          AND ( ACTION_CODE = 'response' OR ACTION_CODE = 'close' OR ACTION_CODE = 'transfer' OR ACTION_CODE = 'created' )
+                          AND PROJECT_ID IN ( SELECT ID FROM fact_origin_project_main_daily WHERE DEL_FLAG = 0 AND PROJECT_STATUS = 'closed' AND ORIGIN = "issue")
+                        GROUP BY
+                            PROJECT_ID
+                        HAVING
+                            COUNT(DISTINCT ( ORG_ID )) = 1) a
+                GROUP BY
+                    orgId
+            ) a ON fm.GRID_ID = a.orgId
+        WHERE
+            PROJECT_STATUS = 'closed'
+          AND ORIGIN = "issue"
+          AND CUSTOMER_ID = #{customerId}
+         AND DATE_ID &lt;= #{dateId}
+        GROUP BY
+            GRID_ID
+    </select>
 </mapper>

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

@@ -240,7 +240,7 @@
                      INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
                      AND da.`LEVEL` = #{level}
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.MONTH_ID = #{monthId}
              GROUP BY
@@ -254,7 +254,7 @@
                      INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
                      AND da.`LEVEL` = #{level}
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.MONTH_ID = #{monthId}
                AND fm.IS_RESOLVED = 'resolved'
@@ -274,7 +274,7 @@
              FROM
                  fact_origin_project_main_daily fm
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.GRID_ID != ''
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.MONTH_ID = #{monthId}
@@ -287,7 +287,7 @@
              FROM
                  fact_origin_project_main_daily fm
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.GRID_ID != ''
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.MONTH_ID = #{monthId}
@@ -819,7 +819,7 @@
              FROM
                  fact_origin_project_main_daily fm
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.GRID_ID != ''
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.DATE_ID <= #{dateId}
@@ -832,7 +832,7 @@
              FROM
                  fact_origin_project_main_daily fm
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.GRID_ID != ''
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.DATE_ID <= #{dateId}
@@ -891,7 +891,7 @@
                      INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
                      AND da.`LEVEL` = #{level}
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.DATE_ID <= #{dateId}
              GROUP BY
@@ -905,7 +905,7 @@
                      INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
                      AND da.`LEVEL` = #{level}
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.DATE_ID <= #{dateId}
                AND fm.IS_RESOLVED = 'resolved'

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml

@@ -266,7 +266,7 @@
             RESOLVE_PROJECT_COUNT,
             SATISFACTION_RATIO
         FROM
-            fact_index_govrn_ablity_grid_monthly
+            fact_index_govrn_ablity_grid_daily
         WHERE
             CUSTOMER_ID = #{customerId}
           AND DATE_ID <= #{dateId}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml

@@ -25,7 +25,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
     <delete id="deleteRankData">
-        delete from screen_govern_rank_data
+        delete from screen_govern_rank_data_daily
         where CUSTOMER_ID = #{customerId}
         AND DATE_ID &lt;= #{dateId}
         <if test='null != orgType and "" != orgType'>