+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dao.evaluationindex.extract;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 组织的治理指数,按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Mapper
+public interface FactAgencyGovernDailyDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactAgencyGovernDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactAgencyGovernDailyEntity.java
new file mode 100644
index 0000000000..2f37f9a113
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactAgencyGovernDailyEntity.java
@@ -0,0 +1,174 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.service.evaluationindex.extract.todata;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
+
+/**
+ * 组织的治理指数,按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+public interface FactAgencyGovernDailyService extends BaseService {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
new file mode 100644
index 0000000000..e40ffd49bd
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.constant.OrgTypeConstant;
+import com.epmet.dao.evaluationindex.screen.ScreenGovernRankDataDailyDao;
+import com.epmet.dto.screen.ScreenGovernRankDataDailyDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataDailyEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenGovernRankDataDailyService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 基层治理-治理能力排行数据(按月统计)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Service
+@Slf4j
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+public class ScreenGovernRankDataDailyServiceImpl extends BaseServiceImpl implements ScreenGovernRankDataDailyService {
+
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, ScreenGovernRankDataDailyDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, ScreenGovernRankDataDailyDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public ScreenGovernRankDataDailyDTO get(String id) {
+ ScreenGovernRankDataDailyEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, ScreenGovernRankDataDailyDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(ScreenGovernRankDataDailyDTO dto) {
+ ScreenGovernRankDataDailyEntity entity = ConvertUtils.sourceToTarget(dto, ScreenGovernRankDataDailyEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(ScreenGovernRankDataDailyDTO dto) {
+ ScreenGovernRankDataDailyEntity entity = ConvertUtils.sourceToTarget(dto, ScreenGovernRankDataDailyEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除(@TableLogic 注解)
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 构造screen_govern_rank_data 初始数据,先赋值为0
+ *
+ * @param customerId
+ * @param orgType
+ * @param agencyLevel
+ * @return java.util.List
+ * @author zhaoqifeng
+ * @date 2020/9/24 14:41
+ */
+ @Override
+ public List initList(String customerId, String orgType, String agencyLevel) {
+ List list = new ArrayList<>();
+ switch (orgType) {
+ case OrgTypeConstant.AGENCY:
+ log.info("组织级别统计");
+ list = baseDao.initAgencyDataList(customerId, agencyLevel);
+ break;
+ case OrgTypeConstant.GRID:
+ log.info("网格级别统计");
+ list = baseDao.initGridDataList(customerId);
+ break;
+ default:
+ log.info("部门级别统计");
+ break;
+ }
+ return list;
+ }
+
+ /**
+ * 保存抽取结果
+ *
+ * @param customerId
+ * @param orgType
+ * @param dateId
+ * @param deleteSize
+ * @param entityList
+ * @return void
+ * @author zhaoqifeng
+ * @date 2020/9/25 10:32
+ */
+ @Override
+ public void delAndSaveRankData(String customerId, String orgType, String dateId, Integer deleteSize,
+ List entityList) {
+ if (CollectionUtils.isEmpty(entityList)) {
+ return;
+ }
+ List orgIds = new ArrayList<>();
+ for (ScreenGovernRankDataDailyEntity entity : entityList) {
+ orgIds.add(entity.getOrgId());
+ }
+ int deleteNum;
+ do {
+ deleteNum = baseDao.deleteRankData(customerId, orgType, dateId, deleteSize, orgIds);
+ } while (deleteNum != NumConstant.ZERO);
+
+ insertBatch(entityList);
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
index 56a99d5257..36c3ebd05b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
@@ -23,6 +23,7 @@ import com.epmet.dto.ProjectDTO;
import com.epmet.dto.project.ProjectAgencyDTO;
import com.epmet.dto.project.ProjectGridDTO;
import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
+import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
import com.epmet.entity.project.ProjectEntity;
import org.apache.ibatis.annotations.Param;
@@ -152,4 +153,13 @@ public interface ProjectService extends BaseService {
*/
List getProjectCategoryData(String customerId, String dateId);
+ /**
+ * 获取项目满意度
+ * @author zhaoqifeng
+ * @date 2021/5/21 10:04
+ * @param customerId
+ * @return java.util.List
+ */
+ List getProjectSatisfaction(String customerId);
+
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
index d2a3ff001d..3581f920b1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
@@ -26,17 +26,16 @@ import com.epmet.dto.ProjectDTO;
import com.epmet.dto.project.ProjectAgencyDTO;
import com.epmet.dto.project.ProjectCategoryDTO;
import com.epmet.dto.project.ProjectGridDTO;
+import com.epmet.dto.project.ProjectPointDTO;
import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
+import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
import com.epmet.entity.project.ProjectEntity;
import com.epmet.service.project.ProjectService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -163,5 +162,39 @@ public class ProjectServiceImpl extends BaseServiceImpl
+ * @author zhaoqifeng
+ * @date 2021/5/21 10:04
+ */
+ @Override
+ public List getProjectSatisfaction(String customerId) {
+ List list = baseDao.selectProjectSatisfaction(customerId);
+ if (org.apache.commons.collections4.CollectionUtils.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ //获取项目满意指标
+ String value = baseDao.selectValueByKey(customerId, "satisfaction");
+ if (null == value) {
+ //客户没有自定义配置的话取默认配置
+ value = baseDao.selectValueByKey("default", "satisfaction");
+ }
+
+ String finalValue = value;
+ return list.stream().map(item -> {
+ FactOriginProjectMainDailyEntity entity = new FactOriginProjectMainDailyEntity();
+ entity.setId(item.getProjectId());
+ if (item.getPoint() < Integer.parseInt(finalValue)) {
+ entity.setIsSatisfied(NumConstant.ZERO);
+ } else {
+ entity.setIsSatisfied(NumConstant.ONE);
+ }
+ return entity;
+ }).collect(Collectors.toList());
+ }
+
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
index 7b2a4f9ae7..4d913d3edf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
@@ -362,33 +362,22 @@
+
+ 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 = 'close'
+ AND fm.GRID_ID != ''
+ AND fm.CUSTOMER_ID = #{customerId}
+ AND fm.DATE_ID <= #{dateId}
+ 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 = 'close'
+ AND fm.GRID_ID != ''
+ AND fm.CUSTOMER_ID = #{customerId}
+ AND fm.DATE_ID <= #{dateId}
+ AND fm.IS_RESOLVED = 'resolved'
+ GROUP BY
+ fm.GRID_ID) b
+ ON a.GRID_ID = b.GRID_ID
+
+
+ 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.DATE_ID <= #{dateId}
+ 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.DATE_ID <= #{dateId}
+ AND fm.FINISH_ORG_IDS LIKE CONCAT('%', fm.AGENCY_ID,'%')
+ GROUP BY
+ fm.AGENCY_ID) b
+ ON a.AGENCY_ID = b.AGENCY_ID
+
+
+ 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 = 'close'
+ AND fm.CUSTOMER_ID = #{customerId}
+ AND fm.DATE_ID <= #{dateId}
+ 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 = 'close'
+ AND fm.CUSTOMER_ID = #{customerId}
+ AND fm.DATE_ID <= #{dateId}
+ AND fm.IS_RESOLVED = 'resolved'
+ GROUP BY
+ fm.AGENCY_ID) b
+ ON a.AGENCY_ID = b.AGENCY_ID
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
index 755e3aab60..1285067483 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
@@ -256,6 +256,21 @@
CUSTOMER_ID = #{customerId}
AND MONTH_ID = #{monthId}
+
+ SELECT
+ GRID_ID,
+ MONTH_ID,
+ YEAR_ID,
+ PROJECT_TOTAL,
+ SELF_SOLVE_PROJECT_COUNT,
+ RESOLVE_PROJECT_COUNT,
+ SATISFACTION_RATIO
+ FROM
+ fact_index_govrn_ablity_grid_monthly
+ WHERE
+ CUSTOMER_ID = #{customerId}
+ AND DATE_ID <= #{dateId}
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml
new file mode 100644
index 0000000000..eec63e765b
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ delete from screen_govern_rank_data
+ where CUSTOMER_ID = #{customerId}
+ AND DATE_ID <= #{dateId}
+
+ and ORG_TYPE=#{orgType}
+
+
+ and
+ (
+
+ ORG_ID = #{orgId}
+
+ )
+
+ limit #{deleteSize}
+
+
+
+ SELECT DISTINCT
+ CUSTOMER_ID,
+ 'agency' AS ORG_TYPE,
+ AGENCY_ID AS ORG_ID,
+ PID AS PARENT_ID,
+ AGENCY_NAME AS ORG_NAME,
+ 0 AS RESPONSE_RATIO,
+ 0 AS RESOLVED_RATIO,
+ 0 AS GOVERN_RATIO,
+ 0 AS SATISFACTION_RATIO
+ FROM
+ screen_customer_agency
+ WHERE
+ CUSTOMER_ID = #{customerId}
+ AND `LEVEL` = #{level}
+
+
+ SELECT DISTINCT
+ CUSTOMER_ID,
+ 'grid' AS ORG_TYPE,
+ GRID_ID AS ORG_ID,
+ PARENT_AGENCY_ID AS PARENT_ID,
+ GRID_NAME AS ORG_NAME,
+ 0 AS RESPONSE_RATIO,
+ 0 AS RESOLVED_RATIO,
+ 0 AS GOVERN_RATIO,
+ 0 AS SATISFACTION_RATIO
+ FROM
+ screen_customer_grid
+ WHERE
+ CUSTOMER_ID = #{customerId}
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
index 58dd19a9e5..3c5ebd884f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -145,4 +145,21 @@
AND DATE_FORMAT(CREATED_TIME,'%Y%m%d')=#{dateId}
+
+ SELECT
+ PROJECT_ID,
+ ( PERFECT_COUNT * 100 + (SHOULD_EVALUATE_COUNT-PERFECT_COUNT-BAD_COUNT) * 80 + BAD_COUNT * 60 ) DIV SHOULD_EVALUATE_COUNT AS point
+ FROM
+ project_satisfaction_statistics
+ WHERE CUSTOMER_ID = #{customerId}
+
+
+ select
+ PARAMETER_VALUE
+ from
+ customer_project_parameter
+ where DEL_FLAG = '0'
+ and CUSTOMER_ID = #{customerId}
+ and PARAMETER_KEY = #{parameterKey}
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml
index 209d13e228..821ca24983 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml
@@ -131,6 +131,17 @@
AND CUSTOMER_ID = #{customerId}
AND MONTH_ID = #{monthId}
+
+ SELECT
+ GRID_ID,
+ PARTYMEMBER_TOTAL
+ FROM
+ fact_reg_user_grid_daily
+ WHERE
+ DEL_FLAG = '0'
+ AND CUSTOMER_ID = #{customerId}
+ AND DATE_ID <= #{dateId}
+
\ No newline at end of file
From 70edf314c40f7e162873e73cfd83e18bb2fa6763 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 May 2021 17:08:38 +0800
Subject: [PATCH 3/6] zancun
---
.../todata/FactGridGovernDailyService.java | 14 ++++++-
.../impl/FactGridGovernDailyServiceImpl.java | 39 +++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
index d5ffd39cd4..95185f2134 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
@@ -27,6 +27,18 @@ import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
* @since v1.0.0 2021-05-24
*/
public interface FactGridGovernDailyService extends BaseService {
-
+ // 指标解释:
+ // 1、问题解决总数:当前网格内,话题关闭(已解决+无需解决)总数、议题关闭(已解决+无需解决)总数和项目结案(议题转为项目的结案数+项目立项结案数)总数之和
+ // 2、党群自治占比:当前网格内,所有小组内关闭(已解决+无需解决)的话题数与问题解决总数之比(未出小组:未转议题的)
+ // 3、网格自治占比:当前组织下,所有网格内结案项目数与问题解决总数之比(未出网格)
+ /**
+ * 治理指数-网格相关:问题解决总数、党群自治占比、网格自治占比
+ *
+ *
+ * @param customerId
+ * @param dateId
+ * @return
+ */
+ void extractFactGridGovernDaily(String customerId, String dateId);
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index 99e73d3603..38b5a2d8a0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -19,17 +19,56 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.dao.evaluationindex.extract.FactGridGovernDailyDao;
+import com.epmet.dto.org.GridInfoDTO;
import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
+import com.epmet.service.group.GroupDataService;
+import com.epmet.service.org.CustomerAgencyService;
+import com.epmet.service.org.CustomerGridService;
+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.util.List;
+
/**
* 网格的治理指数,按天统计
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-05-24
*/
+@Slf4j
@Service
public class FactGridGovernDailyServiceImpl extends BaseServiceImpl implements FactGridGovernDailyService {
+ @Autowired
+ private GroupDataService groupDataService;
+ @Autowired
+ private CustomerAgencyService customerAgencyService;
+ @Autowired
+ private CustomerGridService customerGridService;
+
+ // 指标解释:
+ // 1、问题解决总数:当前网格内,话题关闭(已解决+无需解决)总数、议题关闭(已解决+无需解决)总数和项目结案(议题转为项目的结案数+项目立项结案数)总数之和
+ // 2、党群自治占比:当前网格内,所有小组内关闭(已解决+无需解决)的话题数与问题解决总数之比(未出小组:未转议题的)
+ // 3、网格自治占比:当前组织下,所有网格内结案项目数与问题解决总数之比(未出网格)
+ /**
+ * 治理指数-网格相关:问题解决总数、党群自治占比、网格自治占比
+ *
+ * @param customerId
+ * @param dateId
+ * @return
+ */
+ @Override
+ public void extractFactGridGovernDaily(String customerId, String dateId) {
+ //客户id, dateId不能为空
+ if(StringUtils.isBlank(customerId)||StringUtils.isBlank(dateId)){
+ return;
+ }
+ // 2、当前客户下所有的网格
+ List gridInfoDTOList=customerGridService.queryGridInfoList(customerId);
+ //todo
+ // List
+ }
}
\ No newline at end of file
From e789a8941667d91612e1561b0bad7242bde198ff Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 May 2021 17:21:05 +0800
Subject: [PATCH 4/6] FactAgencyGovernDailyService
---
.../todata/FactAgencyGovernDailyService.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
index 1f8440c281..2c0050903c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
@@ -27,5 +27,20 @@ import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
* @since v1.0.0 2021-05-24
*/
public interface FactAgencyGovernDailyService extends BaseService {
+ // 问题解决总数:当前组织下,话题关闭(已解决+无需解决)总数、议题关闭(已解决+无需解决)总数和项目结案(议题转为项目的结案数+项目立项结案数)总数之和
+ // 党群自治占比:当前组织下,所有小组内关闭(已解决+无需解决)的话题数与问题解决总数之比(未出小组:未转议题的)
+ // 网格自治占比:当前组织下,所有网格内结案项目数与问题解决总数之比(未出网格)
+ // 参考:fact_index_govrn_ablity_grid_monthly的SELF_SOLVE_PROJECT_COUNT计算
+ // 社区解决占比:当前组织下,由社区结案的项目数与问题解决总数之比
+ // 区直部门解决占比:当前组织下,由区级部门结案的项目数与问题解决总数之比
+ // 街道解决占比:当前组织下,由街道结案的项目数与问题解决总数之比
+ // 自下而上的项目解决:结案时操作人所代表的的处理部门(可以是网格、街道、组织)
+ // 自上而下的项目解决:向下吹哨,谁立项谁解决(后期在讨论哪样更合理)
+ //
+ // 究竟是谁解决!!:
+ // A社区→A街道→B社区(结案)——A街道解决(自下而上吹(饱含立项往上吹/从话题来的项目),看往上吹的最高层级)
+ // A社区→B社区→C社区(结案)——C社区解决(平级协助解决,看最后结案)
+ // A街道→A社区→B社区(结案)——A街道解决(自上而下吹,谁立项谁解决)
+ // 注:A社区→A街道→(退回)A社区→B社区(结案),A街道不算处理项目,仍是平级协助解决,看最后谁结案
}
\ No newline at end of file
From 2feb3140670bc73441ba7afdfc8b1c29d68c1db5 Mon Sep 17 00:00:00 2001
From: zhaoqifeng
Date: Tue, 25 May 2021 10:15:07 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?=
=?UTF-8?q?=E6=B2=BB=E7=90=86=E8=83=BD=E5=8A=9B=E6=8E=92=E8=A1=8C=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE(=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/controller/DemoController.java | 9 ++++
.../extract/FactOriginProjectLogDailyDao.java | 10 ++++
.../FactOriginProjectLogDailyService.java | 10 ++++
.../FactOriginProjectLogDailyServiceImpl.java | 14 +++++
.../GovernRankDataExtractServiceImpl.java | 10 ++--
.../ScreenGovernRankDataDailyServiceImpl.java | 1 +
.../extract/FactOriginProjectLogDailyDao.xml | 52 +++++++++++++++----
.../extract/FactOriginProjectMainDailyDao.xml | 16 +++---
.../FactIndexGovrnAblityGridMonthlyDao.xml | 2 +-
.../screen/ScreenGovernRankDataDailyDao.xml | 2 +-
10 files changed, 101 insertions(+), 25 deletions(-)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 644830e3a2..dbedc28b8c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/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
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
index ed79666c63..78f9be78e9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
+++ b/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
*/
List 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
+ */
+ List selectGridSelfDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
index 13c0e1d6c8..141a8dc7b8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
+++ b/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
*/
List getGridClosed(String customerId, String monthId);
+
+ /**
+ * 网格自制率统计-按天
+ * @author zhaoqifeng
+ * @date 2021/5/24 17:52
+ * @param customerId
+ * @param dateId
+ * @return java.util.List
+ */
+ List getGridSelfDaily(String customerId, String dateId);
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
index b01e714325..3dde0b0032 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
+++ b/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
+ * @author zhaoqifeng
+ * @date 2021/5/24 17:52
+ */
+ @Override
+ public List getGridSelfDaily(String customerId, String dateId) {
+ return baseDao.selectGridSelfDaily(customerId, dateId);
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
index 8d88c42e05..80d3f22ee7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
+++ b/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 gridList = factIndexGovrnAblityGridMonthlyService.getGridByCustomerDaily(customerId, dateId);
+ List 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));
}
}));
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java
index 6c9054d6b0..3c48645963 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java
+++ b/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 entityList) {
if (CollectionUtils.isEmpty(entityList)) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
index 4d913d3edf..411d959a57 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
+++ b/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
+ 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 <= #{dateId}
+ GROUP BY
+ GRID_ID
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
index 34156fb11b..c6e024c502 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/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'
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
index 1285067483..800adbfb30 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
+++ b/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}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml
index eec63e765b..b38ec6cce5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml
@@ -25,7 +25,7 @@
- delete from screen_govern_rank_data
+ delete from screen_govern_rank_data_daily
where CUSTOMER_ID = #{customerId}
AND DATE_ID <= #{dateId}
From 93277b9580ab1fe22e63737e753a6711a2609e30 Mon Sep 17 00:00:00 2001
From: sunyuchao
Date: Tue, 25 May 2021 15:25:19 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=BB=84=E7=BB=87/=E7=BD=91=E6=A0=BC?=
=?UTF-8?q?=E4=B8=8B=E5=93=8D=E5=BA=94=E8=A7=A3=E5=86=B3=E6=BB=A1=E6=84=8F?=
=?UTF-8?q?=E8=87=AA=E6=B2=BB=E7=8E=87=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B9=B6?=
=?UTF-8?q?=E5=BC=95=E5=85=A5epmet=5Fevaluation=5Findex=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../constant/DataSourceConstant.java | 2 +
.../dto/datastats/form/GovrnRatioFormDTO.java | 33 ++++++++++
.../datastats/result/GovrnRatioResultDTO.java | 27 +++++++++
.../data-aggregator-server/pom.xml | 60 ++++++++++++++-----
.../controller/DataStatsController.java | 15 +++++
.../evaluationindex/EvaluationIndexDao.java | 37 ++++++++++++
.../service/datastats/DataStatsService.java | 7 +++
.../datastats/impl/DataStatsServiceImpl.java | 32 ++++++++++
.../EvaluationIndexService.java | 18 ++++++
.../impl/EvaluationIndexServiceImpl.java | 40 +++++++++++++
.../src/main/resources/bootstrap.yml | 11 +++-
.../evaluationindex/EvaluationIndexDao.xml | 23 +++++++
12 files changed, 286 insertions(+), 19 deletions(-)
create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GovrnRatioFormDTO.java
create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GovrnRatioResultDTO.java
create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
index b5395e65b6..ce186bfffc 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
+++ b/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";
}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GovrnRatioFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GovrnRatioFormDTO.java
new file mode 100644
index 0000000000..7e5407a8ef
--- /dev/null
+++ b/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 {}
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GovrnRatioResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GovrnRatioResultDTO.java
new file mode 100644
index 0000000000..75a6f5ee1b
--- /dev/null
+++ b/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%";
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index a2cc3bc297..ab8c36be1a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -158,11 +158,18 @@
EpmEt-db-UsEr
-
+
-
- epmet_data_statistical_user
- EpmEt-db-UsEr
+
+ epmet_data_statistical_user
+ EpmEt-db-UsEr
+
+
+
+
+
+ epmet_evaluation_index_user
+ EpmEt-db-UsEr0
@@ -246,11 +253,18 @@
EpmEt-db-UsEr
-
+
-
- epmet_data_statistical_user
- EpmEt-db-UsEr
+
+ epmet_data_statistical_user
+ EpmEt-db-UsEr
+
+
+
+
+
+ epmet_evaluation_index_user
+ EpmEt-db-UsEr0
@@ -334,11 +348,18 @@
elink@833066
-
+
-
- epmet
- elink@833066
+
+ epmet
+ elink@833066
+
+
+
+
+
+ epmet
+ elink@8330660
@@ -422,11 +443,18 @@
EpmEt-db-UsEr
-
+
-
- epmet_data_statistical_user
- EpmEt-db-UsEr
+
+ epmet_data_statistical_user
+ EpmEt-db-UsEr
+
+
+
+
+
+ epmet_evaluation_index_user
+ EpmEt-db-UsEr0
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 74b2552e43..a56d769119 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/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>().ok(dataStatsService.subGridGovrnList(formDTO));
}
+ /**
+ * @Param formDTO
+ * @Description 治理实况-组织/网格下响应解决满意自治率
+ * @author sun
+ */
+ @PostMapping("governratio")
+ public Result 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().ok(dataStatsService.governRatio(formDTO));
+ }
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
new file mode 100644
index 0000000000..c9084a0b4b
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 472bc277b4..8b08a765d2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/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 subGridGovrnList(GridGovrnFormDTO formDTO);
+
+ /**
+ * @Param formDTO
+ * @Description 治理实况-组织/网格下响应解决满意自治率
+ * @author sun
+ */
+ GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 59bca42a8a..c636d2fe11 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/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;
+ }
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
new file mode 100644
index 0000000000..909a3dc208
--- /dev/null
+++ b/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);
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
new file mode 100644
index 0000000000..bec7bafd90
--- /dev/null
+++ b/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());
+ }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
index cd8b7b8ef1..ab888fc91c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
+++ b/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
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
new file mode 100644
index 0000000000..a0c2e0c245
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+ 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}
+
+
+
\ No newline at end of file