治理能力统计

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

@@ -35,6 +35,7 @@ import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollCommunityS
 import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollStreetService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
+import com.epmet.service.evaluationindex.extract.toscreen.GovernRankDataExtractService;
 import com.epmet.service.evaluationindex.extract.toscreen.PartyBaseInfoService;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenCentralZoneDataAbsorptionService;
 import com.epmet.service.evaluationindex.extract.toscreen.PartyGuideService;
@@ -105,6 +106,8 @@ public class DemoController {
     private IndexCollStreetService indexCollStreetService;
     @Autowired
     private ScreenCentralZoneDataAbsorptionService screenCentralZoneDataAbsorptionService;
+    @Autowired
+    private GovernRankDataExtractService governRankDataExtractService;
 
     @GetMapping("testAlarm")
     public void testAlarm() {
@@ -662,4 +665,12 @@ public class DemoController {
         screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
         return new Result();
     }
+
+    @PostMapping("governRank")
+    public Result governRank(@RequestBody CustomerIdAndDateIdFormDTO formDTO){
+        governRankDataExtractService.extractGridData(formDTO.getCustomerId(), formDTO.getDateId());
+        governRankDataExtractService.extractCommunityData(formDTO.getCustomerId(), formDTO.getDateId());
+        governRankDataExtractService.extractStreetData(formDTO.getCustomerId(), formDTO.getDateId());
+        return new Result();
+    }
 }

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

@@ -115,4 +115,25 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	**/
 	List<ProjectParticipatedAgencyResultDTO> selectProjectParticipatedAgency(@Param("customerId") String customerId, @Param("dimId") String dimId,
 																			 @Param("dateType")String dateType);
+
+	/**
+	 * 网格项目响应度
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 10:01
+	 * @param customerId
+	 * @param monthId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectGridResponse(@Param("customerId") String customerId, @Param("monthId") String monthId);
+
+	/**
+	 * 组织项目响应度
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 10:01
+	 * @param customerId
+	 * @param monthId
+	 * @param level
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectOrgResponse(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("level")String level);
 }

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

@@ -134,4 +134,39 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	int getAgencyClosedProjectTotal(@Param("customerId") String customerId,
 									@Param("agencyPath")String agencyPath,
 									@Param("closedStatus")String closedStatus);
+
+	/**
+	 * 组织自治项目数
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 15:16
+	 * @param customerId
+	 * @param monthId
+	 * @param level
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> getSelfProject(@Param("customerId") String customerId, @Param("monthId")String monthId,
+												@Param("level") String level);
+
+
+	/**
+	 * 组织解决项目数
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 15:16
+	 * @param customerId
+	 * @param monthId
+	 * @param level
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> getResolveProject(@Param("customerId") String customerId, @Param("monthId")String monthId,
+												@Param("level") String level);
+
+	/**
+	 * 网格解决项目数
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 15:16
+	 * @param customerId
+	 * @param monthId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> getGridResolveProject(@Param("customerId") String customerId, @Param("monthId")String monthId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.java

@@ -77,4 +77,16 @@ public interface FactIndexGovrnAblityOrgMonthlyDao extends BaseDao<FactIndexGovr
      * @return java.lang.Integer
      */
     Integer deleteByCustomer(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("type") String type);
+
+    /**
+     * 根据客户查询组织治理能力
+     * @author zhaoqifeng
+     * @date 2020/9/25 14:02
+     * @param customerId
+     * @param monthId
+     * @param type
+     * @return java.util.List<com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity>
+     */
+    List<FactIndexGovrnAblityOrgMonthlyEntity> selectOrgByCustomer(@Param("customerId") String customerId, @Param("monthId") String monthId,
+                                                                    @Param("type") String type);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenGovernRankDataDao.java

@@ -75,4 +75,19 @@ public interface ScreenGovernRankDataDao extends BaseDao<ScreenGovernRankDataEnt
      * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity>
      */
     List<ScreenGovernRankDataEntity> initGridDataList(@Param("customerId") String customerId);
+
+
+    /**
+     * 删除旧数据
+     * @author zhaoqifeng
+     * @date 2020/9/25 10:38
+     * @param customerId
+     * @param orgType
+     * @param deleteSize
+     * @param orgIds
+     * @return java.lang.Integer
+     */
+    Integer deleteRankData(@Param("customerId") String customerId, @Param("orgType") String orgType, @Param("monthId") String monthId,
+                           @Param("deleteSize") Integer deleteSize,
+                           @Param("orgIds")List<String> orgIds);
 }

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

@@ -197,4 +197,25 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
     **/
     Map<String, BigDecimal> getAgencyWorkPieceRatio(String customerId, String dimId,String dateType);
 
+    /**
+     * 网格项目响应度
+     * @author zhaoqifeng
+     * @date 2020/9/25 9:56
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getGridResponse(String customerId, String monthId);
+
+    /**
+     * 组织项目响应度
+     * @author zhaoqifeng
+     * @date 2020/9/25 9:56
+     * @param customerId
+     * @param monthId
+     * @param level
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getOrgResponse(String customerId, String monthId, String level);
+
 }

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

@@ -185,4 +185,35 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @Date 2020/9/24 17:37
      **/
     int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus);
+
+    /**
+     * 自治项目数
+     * @author zhaoqifeng
+     * @date 2020/9/25 15:34
+     * @param customerId
+     * @param monthId
+     * @param level
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getSelfProject(String customerId, String monthId, String level);
+    /**
+     * 已解决项目数
+     * @author zhaoqifeng
+     * @date 2020/9/25 15:34
+     * @param customerId
+     * @param monthId
+     * @param level
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getResolveProject(String customerId, String monthId, String level);
+
+    /**
+     * 网格已解决项目数
+     * @author zhaoqifeng
+     * @date 2020/9/25 15:34
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getGridResolveProject(String customerId, String monthId);
 }

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

@@ -267,5 +267,15 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
         return efficiencyMap;
     }
 
+    @Override
+    public List<OrgStatisticsResultDTO> getGridResponse(String customerId, String monthId) {
+        return baseDao.selectGridResponse(customerId, monthId);
+    }
+
+    @Override
+    public List<OrgStatisticsResultDTO> getOrgResponse(String customerId, String monthId, String level) {
+        return baseDao.selectOrgResponse(customerId, monthId, level);
+    }
+
 
 }

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

@@ -198,4 +198,19 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
     public int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus) {
         return baseDao.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus);
     }
+
+    @Override
+    public List<OrgStatisticsResultDTO> getSelfProject(String customerId, String monthId, String level) {
+        return baseDao.getSelfProject(customerId, monthId, level);
+    }
+
+    @Override
+    public List<OrgStatisticsResultDTO> getResolveProject(String customerId, String monthId, String level) {
+        return baseDao.getResolveProject(customerId, monthId, level);
+    }
+
+    @Override
+    public List<OrgStatisticsResultDTO> getGridResolveProject(String customerId, String monthId) {
+        return baseDao.getGridResolveProject(customerId, monthId);
+    }
 }

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

@@ -1,15 +1,21 @@
 package com.epmet.service.evaluationindex.extract.toscreen.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.IndexCalConstant;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyDao;
+import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity;
+import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
 import com.epmet.service.evaluationindex.extract.toscreen.GovernRankDataExtractService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.screen.ScreenGovernRankDataService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
@@ -21,6 +27,7 @@ import java.util.List;
  * @dscription
  * @date 2020/9/24 14:31
  */
+@Service
 public class GovernRankDataExtractServiceImpl implements GovernRankDataExtractService {
 	@Autowired
 	private ScreenGovernRankDataService screenGovernRankDataService;
@@ -28,37 +35,138 @@ public class GovernRankDataExtractServiceImpl implements GovernRankDataExtractSe
 	private FactIndexGovrnAblityOrgMonthlyService factIndexGovrnAblityOrgMonthlyService;
 	@Autowired
 	private FactIndexGovrnAblityGridMonthlyService factIndexGovrnAblityGridMonthlyService;
+	@Autowired
+	private FactOriginProjectLogDailyService factOriginProjectLogDailyService;
+	@Autowired
+	private FactOriginProjectMainDailyService factOriginProjectMainDailyService;
 
+	public static void main(String[] args) {
+		String monthId = "202006";
+		System.out.println(monthId.substring(0,4));
+	}
 	@Override
 	public void extractGridData(String customerId, String monthId) {
 		List<ScreenGovernRankDataEntity> list = screenGovernRankDataService.initList(customerId, OrgTypeConstant.GRID, null);
 		if (CollectionUtils.isEmpty(list)) {
 			return;
 		}
+		list.forEach(entity -> {
+			entity.setYearId(monthId.substring(NumConstant.ZERO, NumConstant.FOUR));
+			entity.setMonthId(monthId);
+		});
 		List<FactIndexGovrnAblityGridMonthlyEntity> gridList = factIndexGovrnAblityGridMonthlyService.getGridByCustomer(customerId, monthId);
-		list.forEach(entity -> gridList.stream().filter(gridAblity -> entity.getOrgId().equals(gridAblity.getGridId())).forEach(grid -> {
-			BigDecimal total = new BigDecimal(grid.getProjectTotal());
-			entity.setYearId(grid.getYearId());
-			entity.setMonthId(grid.getMonthId());
-			//TODO 响应率
-			//解决率
+		list.forEach(entity -> gridList.stream().filter(gridAbility -> entity.getOrgId().equals(gridAbility.getGridId())).forEach(grid -> {
+
 			BigDecimal resolveCount = new BigDecimal(grid.getResolveProjectCount());
-			entity.setResolvedRatio(resolveCount.divide(total, NumConstant.SIX, RoundingMode.HALF_UP));
 			//自治率
 			BigDecimal selfCount = new BigDecimal(grid.getSelfSolveProjectCount());
-			entity.setGovernRatio(selfCount.divide(total, NumConstant.SIX, RoundingMode.HALF_UP));
+			if(grid.getResolveProjectCount()!= NumConstant.ZERO) {
+				entity.setGovernRatio(selfCount.divide(resolveCount, NumConstant.SIX, RoundingMode.HALF_UP));
+			}
 			//满意率
 			entity.setSatisfactionRatio(grid.getSatisfactionRatio());
 		}));
+
+		//响应率 响应次数/流转到网格的次数
+		List<OrgStatisticsResultDTO> responseList = factOriginProjectLogDailyService.getGridResponse(customerId, monthId);
+		list.forEach(entity -> responseList.stream().filter(response -> entity.getOrgId().equals(response.getOrgId())).forEach(dto -> {
+			BigDecimal sum = new BigDecimal(dto.getSum());
+			BigDecimal count = new BigDecimal(dto.getCount());
+			entity.setResponseRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+		}));
+
+		//解决率 已解决项目数/办结项目数
+		List<OrgStatisticsResultDTO> resolveList = factOriginProjectMainDailyService.getGridResolveProject(customerId, monthId);
+		list.forEach(entity -> resolveList.stream().filter(resolve -> entity.getOrgId().equals(resolve.getOrgId())).forEach(dto -> {
+			BigDecimal sum = new BigDecimal(dto.getSum());
+			BigDecimal count = new BigDecimal(dto.getCount());
+			entity.setResolvedRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+		}));
+
+		screenGovernRankDataService.delAndSaveRankData(customerId, OrgTypeConstant.GRID, monthId, IndexCalConstant.DELETE_SIZE, list);
 	}
 
 	@Override
 	public void extractCommunityData(String customerId, String monthId) {
+		List<ScreenGovernRankDataEntity> list = screenGovernRankDataService.initList(customerId, OrgTypeConstant.AGENCY, OrgTypeConstant.COMMUNITY);
+		if (CollectionUtils.isEmpty(list)) {
+			return;
+		}
+		list.forEach(entity -> {
+			entity.setYearId(monthId.substring(NumConstant.ZERO, NumConstant.FOUR));
+			entity.setMonthId(monthId);
+		});
+		List<FactIndexGovrnAblityOrgMonthlyEntity> orgList =  factIndexGovrnAblityOrgMonthlyService.getOrgByCustomer(customerId, monthId,
+				OrgTypeConstant.COMMUNITY);
+		list.forEach(entity -> orgList.stream().filter(orgAbility -> entity.getOrgId().equals(orgAbility.getAgencyId())).forEach(org -> {
+			//满意率
+			entity.setSatisfactionRatio(org.getSatisfactionRatio());
+		}));
 
+		//响应率 响应次数/流转到网格的次数
+		List<OrgStatisticsResultDTO> responseList = factOriginProjectLogDailyService.getOrgResponse(customerId, monthId, OrgTypeConstant.COMMUNITY);
+		list.forEach(entity -> responseList.stream().filter(response -> entity.getOrgId().equals(response.getAgencyId())).forEach(dto -> {
+			BigDecimal sum = new BigDecimal(dto.getSum());
+			BigDecimal count = new BigDecimal(dto.getCount());
+			entity.setResponseRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+		}));
+		//自制率 自治项目数/办结项目数
+		List<OrgStatisticsResultDTO> selfList = factOriginProjectMainDailyService.getSelfProject(customerId, monthId, OrgTypeConstant.COMMUNITY);
+		list.forEach(entity -> selfList.stream().filter(self -> entity.getOrgId().equals(self.getAgencyId())).forEach(dto -> {
+			BigDecimal sum = new BigDecimal(dto.getSum());
+			BigDecimal count = new BigDecimal(dto.getCount());
+			entity.setGovernRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+		}));
+		//解决率 已解决项目数/办结项目数
+		List<OrgStatisticsResultDTO> resolveList = factOriginProjectMainDailyService.getResolveProject(customerId, monthId,
+				OrgTypeConstant.COMMUNITY);
+		list.forEach(entity -> resolveList.stream().filter(resolve -> entity.getOrgId().equals(resolve.getAgencyId())).forEach(dto -> {
+			BigDecimal sum = new BigDecimal(dto.getSum());
+			BigDecimal count = new BigDecimal(dto.getCount());
+			entity.setResolvedRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+		}));
+		screenGovernRankDataService.delAndSaveRankData(customerId, OrgTypeConstant.AGENCY, monthId, IndexCalConstant.DELETE_SIZE, list);
 	}
 
 	@Override
 	public void extractStreetData(String customerId, String monthId) {
+		List<ScreenGovernRankDataEntity> list = screenGovernRankDataService.initList(customerId, OrgTypeConstant.AGENCY, OrgTypeConstant.STREET);
+		if (CollectionUtils.isEmpty(list)) {
+			return;
+		}
+		list.forEach(entity -> {
+			entity.setYearId(monthId.substring(NumConstant.ZERO, NumConstant.FOUR));
+			entity.setMonthId(monthId);
+		});
+		List<FactIndexGovrnAblityOrgMonthlyEntity> orgList =  factIndexGovrnAblityOrgMonthlyService.getOrgByCustomer(customerId, monthId,
+				OrgTypeConstant.STREET);
+		list.forEach(entity -> orgList.stream().filter(orgAbility -> entity.getOrgId().equals(orgAbility.getAgencyId())).forEach(org -> {
+			//满意率
+			entity.setSatisfactionRatio(org.getSatisfactionRatio());
+		}));
 
+		//响应率 响应次数/流转到网格的次数
+		List<OrgStatisticsResultDTO> responseList = factOriginProjectLogDailyService.getOrgResponse(customerId, monthId, OrgTypeConstant.STREET);
+		list.forEach(entity -> responseList.stream().filter(response -> entity.getOrgId().equals(response.getAgencyId())).forEach(dto -> {
+			BigDecimal sum = new BigDecimal(dto.getSum());
+			BigDecimal count = new BigDecimal(dto.getCount());
+			entity.setResponseRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+		}));
+		//自制率 自治项目数/办结项目数
+		List<OrgStatisticsResultDTO> selfList = factOriginProjectMainDailyService.getSelfProject(customerId, monthId, OrgTypeConstant.STREET);
+		list.forEach(entity -> selfList.stream().filter(self -> entity.getOrgId().equals(self.getAgencyId())).forEach(dto -> {
+			BigDecimal sum = new BigDecimal(dto.getSum());
+			BigDecimal count = new BigDecimal(dto.getCount());
+			entity.setGovernRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+		}));
+		//解决率 已解决项目数/办结项目数
+		List<OrgStatisticsResultDTO> resolveList = factOriginProjectMainDailyService.getResolveProject(customerId, monthId,
+				OrgTypeConstant.STREET);
+		list.forEach(entity -> resolveList.stream().filter(resolve -> entity.getOrgId().equals(resolve.getAgencyId())).forEach(dto -> {
+			BigDecimal sum = new BigDecimal(dto.getSum());
+			BigDecimal count = new BigDecimal(dto.getCount());
+			entity.setResolvedRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+		}));
+		screenGovernRankDataService.delAndSaveRankData(customerId, OrgTypeConstant.AGENCY, monthId, IndexCalConstant.DELETE_SIZE, list);
 	}
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyService.java

@@ -49,4 +49,15 @@ public interface FactIndexGovrnAblityOrgMonthlyService extends BaseService<FactI
 	 * @return void
 	 */
 	void saveList(List<FactIndexGovrnAblityOrgMonthlyEntity> list);
+	
+	/**
+	 * 根据客户查询组织治理能力
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 13:56
+	 * @param customerId
+	 * @param monthId
+	 * @param type
+	 * @return java.util.List<com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity>
+	 */
+	List<FactIndexGovrnAblityOrgMonthlyEntity> getOrgByCustomer(String customerId, String monthId, String type);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityGridMonthlyServiceImpl.java

@@ -1,9 +1,12 @@
 package com.epmet.service.evaluationindex.indexcoll.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyService;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -12,6 +15,8 @@ import java.util.List;
  * @dscription
  * @date 2020/9/24 14:36
  */
+@Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class FactIndexGovrnAblityGridMonthlyServiceImpl extends BaseServiceImpl<FactIndexGovrnAblityGridMonthlyDao, FactIndexGovrnAblityGridMonthlyEntity> implements FactIndexGovrnAblityGridMonthlyService {
 	@Override
 	public List<FactIndexGovrnAblityGridMonthlyEntity> getGridByCustomer(String customerId, String monthId) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityOrgMonthlyServiceImpl.java

@@ -46,4 +46,9 @@ public class FactIndexGovrnAblityOrgMonthlyServiceImpl extends BaseServiceImpl<F
 	public void saveList(List<FactIndexGovrnAblityOrgMonthlyEntity> list) {
 		insertBatch(list);
 	}
+
+	@Override
+	public List<FactIndexGovrnAblityOrgMonthlyEntity> getOrgByCustomer(String customerId, String monthId, String type) {
+		return baseDao.selectOrgByCustomer(customerId, monthId, type);
+	}
 }

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

@@ -32,12 +32,27 @@ import java.util.List;
 public interface ScreenGovernRankDataService extends BaseService<ScreenGovernRankDataEntity> {
 	/**
 	 * 构造screen_govern_rank_data 初始数据，先赋值为0
-	 * @author zhaoqifeng
-	 * @date 2020/9/24 14:41
+	 *
 	 * @param customerId
 	 * @param orgType
 	 * @param agencyLevel
 	 * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity>
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 14:41
 	 */
 	List<ScreenGovernRankDataEntity> initList(String customerId, String orgType, String agencyLevel);
+
+	/**
+	 * 保存抽取结果
+	 *
+	 * @param customerId
+	 * @param orgType
+	 * @param monthId
+	 * @param deleteSize
+	 * @param entityList
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 10:32
+	 */
+	void delAndSaveRankData(String customerId, String orgType, String monthId, Integer deleteSize, List<ScreenGovernRankDataEntity> entityList);
 }

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

@@ -18,13 +18,19 @@
 package com.epmet.service.evaluationindex.screen.impl;
 
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenGovernRankDataDao;
 import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenPioneerDataEntity;
 import com.epmet.service.evaluationindex.screen.ScreenGovernRankDataService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,6 +43,7 @@ import java.util.List;
  */
 @Service
 @Slf4j
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class ScreenGovernRankDataServiceImpl extends BaseServiceImpl<ScreenGovernRankDataDao, ScreenGovernRankDataEntity> implements ScreenGovernRankDataService {
 
 
@@ -58,4 +65,23 @@ public class ScreenGovernRankDataServiceImpl extends BaseServiceImpl<ScreenGover
 		}
 		return list;
 	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public void delAndSaveRankData(String customerId, String orgType, String monthId, Integer deleteSize,
+								   List<ScreenGovernRankDataEntity> entityList) {
+		if (CollectionUtils.isEmpty(entityList)) {
+			return;
+		}
+		List<String> orgIds = new ArrayList<>();
+		for (ScreenGovernRankDataEntity entity : entityList) {
+			orgIds.add(entity.getOrgId());
+		}
+		int deleteNum;
+		do {
+			deleteNum = baseDao.deleteRankData(customerId, orgType, monthId, deleteSize, orgIds);
+		} while (deleteNum != NumConstant.ZERO);
+
+		insertBatch(entityList);
+	}
 }

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

@@ -187,4 +187,69 @@
 
         ORDER BY project.ID,score DESC
     </select>
+    <select id="selectGridResponse" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT a.ORG_ID,
+               a.count AS "sum",
+               IFNULL( b.count,
+                       0 ) AS "count"
+        FROM
+            (SELECT ORG_ID,
+                    COUNT( ID ) AS "count"
+             FROM fact_origin_project_log_daily
+             WHERE ORG_TYPE = 'grid'
+               AND IS_ACTIVE = 0
+               AND CUSTOMER_ID = #{customerId}
+               AND MONTH_ID = #{monthId}
+             GROUP BY  ORG_ID ) a
+                LEFT JOIN
+            (SELECT ORG_ID,
+                    COUNT( ID ) AS "count"
+             FROM fact_origin_project_log_daily
+             WHERE ORG_TYPE = 'grid'
+               AND ( ACTION_CODE = 'response'
+                 OR 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}
+               AND MONTH_ID = #{monthId}
+             GROUP BY  ORG_ID ) b
+            ON a.ORG_ID = b.ORG_ID
+    </select>
+    <select id="selectOrgResponse" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT a.AGENCY_ID,
+               a.count AS "sum",
+               IFNULL( b.count,
+                       0 ) AS "count"
+        FROM
+            (SELECT f.AGENCY_ID,
+                    COUNT( f.ID ) AS "count"
+             FROM fact_origin_project_log_daily f
+             INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID
+                AND da.`LEVEL` = #{level}
+             WHERE f.IS_ACTIVE = 0
+               AND f.CUSTOMER_ID = #{customerId}
+               AND f.MONTH_ID = #{monthId}
+             GROUP BY  f.AGENCY_ID ) a
+                LEFT JOIN
+            (SELECT f.AGENCY_ID,
+                    COUNT( f.ID ) AS "count"
+             FROM fact_origin_project_log_daily f
+             INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID
+                 AND da.`LEVEL` = #{level}
+             WHERE
+                 ( ACTION_CODE = 'response'
+                     OR ACTION_CODE = 'close'
+                     OR ACTION_CODE = 'transfer'
+                     OR ACTION_CODE = 'resolved'
+                     OR ACTION_CODE = 'unresolved'
+                     OR ACTION_CODE = 'created' )
+               AND f.IS_ACTIVE = 1
+               AND f.CUSTOMER_ID = #{customerId}
+               AND f.MONTH_ID = #{monthId}
+             GROUP BY  f.AGENCY_ID ) b
+            ON a.AGENCY_ID = b.AGENCY_ID
+    </select>
 </mapper>

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

@@ -178,4 +178,108 @@
                 and t1.CLOSED_STATUS=#{closedStatus}
             </if>
     </select>
+    <select id="getSelfProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            a.AGENCY_ID,
+            a.count AS "sum",
+            IFNULL(b.count,0) AS "count"
+        FROM
+            (SELECT
+                 fm.AGENCY_ID,
+                 COUNT( fm.ID ) AS "count"
+             FROM
+                 fact_origin_project_main_daily fm
+                     INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
+                     AND da.`LEVEL` = #{level}
+             WHERE
+                 fm.PROJECT_STATUS = 'closed'
+                   AND fm.CUSTOMER_ID = #{customerId}
+                   AND fm.MONTH_ID = #{monthId}
+             GROUP BY
+                 fm.AGENCY_ID) a
+            LEFT JOIN
+            (SELECT
+                 fm.AGENCY_ID,
+                 COUNT( fm.ID ) AS "count"
+             FROM
+                 fact_origin_project_main_daily fm
+                     INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
+                     AND da.`LEVEL` = #{level}
+             WHERE
+                 fm.PROJECT_STATUS = 'closed'
+               AND fm.CUSTOMER_ID = #{customerId}
+               AND fm.MONTH_ID = #{monthId}
+               AND fm.FINISH_ORG_IDS LIKE CONCAT('%', fm.AGENCY_ID,'%')
+             GROUP BY
+                 fm.AGENCY_ID) b
+            ON a.AGENCY_ID = b.AGENCY_ID
+    </select>
+    <select id="getResolveProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            a.AGENCY_ID,
+            a.count AS "sum",
+            IFNULL(b.count,0) AS "count"
+        FROM
+            (SELECT
+                 fm.AGENCY_ID,
+                 COUNT( fm.ID ) AS "count"
+             FROM
+                 fact_origin_project_main_daily fm
+                     INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
+                     AND da.`LEVEL` = #{level}
+             WHERE
+                 fm.PROJECT_STATUS = 'closed'
+               AND fm.CUSTOMER_ID = #{customerId}
+               AND fm.MONTH_ID = #{monthId}
+             GROUP BY
+                 fm.AGENCY_ID) a
+                LEFT JOIN
+            (SELECT
+                 fm.AGENCY_ID,
+                 COUNT( fm.ID ) AS "count"
+             FROM
+                 fact_origin_project_main_daily fm
+                     INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
+                     AND da.`LEVEL` = #{level}
+             WHERE
+                 fm.PROJECT_STATUS = 'closed'
+               AND fm.CUSTOMER_ID = #{customerId}
+               AND fm.MONTH_ID = #{monthId}
+               AND fm.IS_RESOLVED = 'resolved'
+             GROUP BY
+                 fm.AGENCY_ID) b
+            ON a.AGENCY_ID = b.AGENCY_ID
+    </select>
+    <select id="getGridResolveProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            a.GRID_ID AS "orgId",
+            a.count AS "sum",
+            IFNULL(b.count,0) AS "count"
+        FROM
+            (SELECT
+                 fm.GRID_ID,
+                 COUNT( fm.ID ) AS "count"
+             FROM
+                 fact_origin_project_main_daily fm
+             WHERE
+                 fm.PROJECT_STATUS = 'closed'
+               AND fm.CUSTOMER_ID = #{customerId}
+               AND fm.MONTH_ID = #{monthId}
+             GROUP BY
+                 fm.GRID_ID) a
+        LEFT JOIN
+            (SELECT
+                 fm.GRID_ID,
+                 COUNT( fm.ID ) AS "count"
+             FROM
+                 fact_origin_project_main_daily fm
+             WHERE
+                 fm.PROJECT_STATUS = 'closed'
+               AND fm.CUSTOMER_ID = #{customerId}
+               AND fm.MONTH_ID = #{monthId}
+               AND fm.IS_RESOLVED = 'resolved'
+             GROUP BY
+                 fm.GRID_ID) b
+            ON a.GRID_ID = b.GRID_ID
+    </select>
 </mapper>

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

@@ -48,7 +48,8 @@
         SELECT
             f.CUSTOMER_ID,
             f.ORG_ID AS "agencyId",
-            SUM( TOTAL_PERIOD ) AS "sum",
+            SUM( TIMESTAMPDIFF( MINUTE, ( DATE_FORMAT( f.INFORMED_DATE, '%Y-%m-%d %H:%i' )),
+            ( DATE_FORMAT( f.PERIOD_TILL_REPLY_FIRSTLY, '%Y-%m-%d %H:%i' )) ) ) AS "sum",
             COUNT( f.ID ) AS "count"
         FROM
             fact_origin_project_org_period_daily f
@@ -57,7 +58,7 @@
         WHERE
             f.ORG_TYPE = #{orgType}
             AND DATE_FORMAT(INFORMED_DATE, '%Y%m') = #{monthId}
-            AND TOTAL_PERIOD != 0
+            AND PERIOD_TILL_REPLY_FIRSTLY IS NOT NULL
             AND f.CUSTOMER_ID = #{customerId}
         GROUP BY
             f.CUSTOMER_ID,

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

@@ -115,4 +115,17 @@
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
     </select>
+    <select id="selectOrgByCustomer" resultType="com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity">
+        SELECT
+            AGENCY_ID,
+            MONTH_ID,
+            YEAR_ID,
+            SATISFACTION_RATIO
+        FROM
+            fact_index_govrn_ablity_org_monthly
+        WHERE
+            CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId}
+         AND data_type = #{type}
+    </select>
 </mapper>

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

@@ -8,6 +8,23 @@
         where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
         limit 1000;
     </delete>
+    <delete id="deleteRankData">
+        delete from screen_govern_rank_data
+        where CUSTOMER_ID = #{customerId}
+        AND MONTH_ID = #{monthId}
+        <if test='null != orgType and "" != orgType'>
+            and ORG_TYPE=#{orgType}
+        </if>
+        <if test='null!=orgIds and orgIds.size()>0'>
+            and
+            (
+            <foreach collection="orgIds" item="orgId" separator=" OR ">
+                ORG_ID = #{orgId}
+            </foreach>
+            )
+        </if>
+        limit #{deleteSize}
+    </delete>
     <select id="initAgencyDataList" resultType="com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity">
         SELECT DISTINCT
             CUSTOMER_ID,