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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java

@@ -28,4 +28,6 @@ public interface DataSourceConstant {
     String OPER_CRM="opercrm";
 
     String DATA_STATISTICAL="datastatistical";
+
+    String EVALUATION_INDEX = "evaluationIndex";
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GovrnRatioFormDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 治理实况-组织/网格下响应解决满意自治率-接口入参
+ * @Auth sun
+ */
+@Data
+public class GovrnRatioFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 组织Id
+     */
+    @NotBlank(message = "组织或网格Id不能为空", groups = GovrnRatioFormDTO.AgencyGrid.class)
+    private String orgId;
+    /**
+     * 组织:agency  网格:grid
+     */
+    @NotBlank(message = "网格Id不能为空", groups = GovrnRatioFormDTO.AgencyGrid.class)
+    private String orgType;
+    /**
+     * 日维度Id[日期，不传值默认查前一天的【格式：20210101】]
+     */
+    private String dateId;
+    public interface AgencyGrid extends CustomerClientShowGroup {}
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GovrnRatioResultDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 治理实况-组织/网格下响应解决满意自治率-接口返参
+ * @Auth sun
+ */
+@Data
+public class GovrnRatioResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    //组织或网格Id
+    private String orgId;
+    //组织:agency  网格:grid
+    private String orgType;
+    //响应率
+    private String responseRatio = "0%";
+    //解决率
+    private String resolvedRatio = "0%";
+    //自治率
+    private String governRatio = "0%";
+    //满意率
+    private String satisfactionRatio = "0%";
+
+}

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -158,11 +158,18 @@
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
-                <datasource.druid.opercrm.url>
+                <datasource.druid.stats.url>
                     <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.opercrm.url>
-                <datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
-                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+                </datasource.druid.stats.url>
+                <datasource.druid.stats.username>epmet_data_statistical_user</datasource.druid.stats.username>
+                <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
+
+                <!-- epmet_evaluation_index -->
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -246,11 +253,18 @@
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
-                <datasource.druid.opercrm.url>
+                <datasource.druid.stats.url>
                     <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.opercrm.url>
-                <datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
-                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+                </datasource.druid.stats.url>
+                <datasource.druid.stats.username>epmet_data_statistical_user</datasource.druid.stats.username>
+                <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
+
+                <!-- epmet_evaluation_index -->
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -334,11 +348,18 @@
                 <datasource.druid.opercrm.password>elink@833066</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
-                <datasource.druid.opercrm.url>
+                <datasource.druid.stats.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.opercrm.url>
-                <datasource.druid.opercrm.username>epmet</datasource.druid.opercrm.username>
-                <datasource.druid.opercrm.password>elink@833066</datasource.druid.opercrm.password>
+                </datasource.druid.stats.url>
+                <datasource.druid.stats.username>epmet</datasource.druid.stats.username>
+                <datasource.druid.stats.password>elink@833066</datasource.druid.stats.password>
+
+                <!-- epmet_evaluation_index -->
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>elink@833066</datasource.druid.evaluationIndex.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -422,11 +443,18 @@
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
-                <datasource.druid.opercrm.url>
+                <datasource.druid.stats.url>
                     <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.opercrm.url>
-                <datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
-                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+                </datasource.druid.stats.url>
+                <datasource.druid.stats.username>epmet_data_statistical_user</datasource.druid.stats.username>
+                <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
+
+                <!-- epmet_evaluation_index -->
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java

@@ -1,5 +1,6 @@
 package com.epmet.dataaggre.controller;
 
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.*;
@@ -200,4 +201,18 @@ public class DataStatsController {
         return new Result<List<GridGovrnResultDTO>>().ok(dataStatsService.subGridGovrnList(formDTO));
     }
 
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织/网格下响应解决满意自治率
+     * @author sun
+     */
+    @PostMapping("governratio")
+    public Result<GovrnRatioResultDTO> governRatio(@RequestBody GovrnRatioFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GovrnRatioFormDTO.AgencyGrid.class);
+        if (!"agency".equals(formDTO.getOrgType()) && !"grid".equals(formDTO.getOrgType())) {
+            throw new RenException(String.format("入参格式错误,错误的组织或网格类型:%s", formDTO.getOrgType()));
+        }
+        return new Result<GovrnRatioResultDTO>().ok(dataStatsService.governRatio(formDTO));
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dao.evaluationindex;
+
+import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Author sun
+ * @Description  指标统计服务
+ */
+@Mapper
+public interface EvaluationIndexDao {
+
+    /**
+     * @Param formDTO
+     * @Description 按类型、日期查询治理指数下响应解决满意自治四个统计率
+     * @author sun
+     */
+    GovrnRatioResultDTO getAgnecyOrGridGoverRatio(@Param("orgId") String orgId, @Param("orgType") String orgType, @Param("dateId") String dateId);
+}

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

@@ -152,4 +152,11 @@ public interface DataStatsService {
      * @author sun
      */
     List<GridGovrnResultDTO> subGridGovrnList(GridGovrnFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织/网格下响应解决满意自治率
+     * @author sun
+     */
+    GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO);
 }

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

@@ -14,6 +14,7 @@ import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.DimGridEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
+import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -39,6 +40,8 @@ import java.util.stream.Collectors;
 public class DataStatsServiceImpl implements DataStatsService {
     @Autowired
     private DataStatsDao dataStatsDao;
+    @Autowired
+    private EvaluationIndexService indexService;
 
 
     /**
@@ -1243,4 +1246,33 @@ public class DataStatsServiceImpl implements DataStatsService {
         return resultList;
     }
 
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织/网格下响应解决满意自治率
+     * @author sun
+     */
+    @Override
+    public GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO) {
+        GovrnRatioResultDTO resultDTO = new GovrnRatioResultDTO();
+        resultDTO.setOrgId(formDTO.getOrgId());
+        resultDTO.setOrgType(formDTO.getOrgType());
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.按类型、日期查询治理指数下响应解决满意自治四个统计率
+        GovrnRatioResultDTO dto = indexService.governRatio(formDTO);
+        if (null != dto) {
+            resultDTO.setResponseRatio(dto.getResponseRatio());
+            resultDTO.setResolvedRatio(dto.getResolvedRatio());
+            resultDTO.setGovernRatio(dto.getGovernRatio());
+            resultDTO.setSatisfactionRatio(dto.getSatisfactionRatio());
+        }
+        return resultDTO;
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java

@@ -0,0 +1,18 @@
+package com.epmet.dataaggre.service.evaluationindex;
+
+import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+
+/**
+ * @Author sun
+ * @Description  指标统计服务
+ */
+public interface EvaluationIndexService {
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织/网格下响应解决满意自治率
+     * @author sun
+     */
+    GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java

@@ -0,0 +1,40 @@
+package com.epmet.dataaggre.service.evaluationindex.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.datastats.DataStatsDao;
+import com.epmet.dataaggre.dao.evaluationindex.EvaluationIndexDao;
+import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @Author sun
+ * @Description 指标统计服务
+ */
+@Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+@Slf4j
+public class EvaluationIndexServiceImpl implements EvaluationIndexService {
+    @Autowired
+    private EvaluationIndexDao evaluationIndexDao;
+
+    /**
+     * @Param formDTO
+     * @Description 按类型、日期查询治理指数下响应解决满意自治四个统计率
+     * @author sun
+     */
+    @Override
+    public GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO) {
+        return  evaluationIndexDao.getAgnecyOrGridGoverRatio(formDTO.getOrgId(),formDTO.getOrgType(),formDTO.getDateId());
+    }
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml

@@ -131,9 +131,14 @@ dynamic:
       password: @datasource.druid.opercrm.password@
     datastatistical:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: @datasource.druid.opercrm.url@
-      username: @datasource.druid.opercrm.username@
-      password: @datasource.druid.opercrm.password@
+      url: @datasource.druid.stats.url@
+      username: @datasource.druid.stats.username@
+      password: @datasource.druid.stats.password@
+    evaluationIndex:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.evaluationIndex.url@
+      username: @datasource.druid.evaluationIndex.username@
+      password: @datasource.druid.evaluationIndex.password@
 feign:
   hystrix:
     enabled: true

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dataaggre.dao.evaluationindex.EvaluationIndexDao">
+
+    <select id="getAgnecyOrGridGoverRatio" resultType="com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO">
+        SELECT
+            org_id AS orgId,
+            org_type AS orgType,
+            CONCAT(ROUND(response_ratio, 1), '%') AS responseRatio,
+            CONCAT(ROUND(resolved_ratio, 1) , '%')AS resolvedRatio,
+            CONCAT(ROUND(govern_ratio, 1), '%') AS governRatio,
+            CONCAT(ROUND(satisfaction_ratio, 1), '%') AS satisfactionRatio
+        FROM
+            screen_govern_rank_data_daily
+        WHERE
+            del_flag = '0'
+        AND org_id = #{orgId}
+        AND org_type = #{orgType}
+        AND date_id = #{dateId}
+    </select>
+
+</mapper>

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

@@ -672,6 +672,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'>