From 2a3bcfde29b80d37196643aa26aa714c72ba2314 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 3 Sep 2020 15:57:56 +0800
Subject: [PATCH] =?UTF-8?q?/data/stats/indexcollect/orggovrnability?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9EhandleProjectRatio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/indexcollect/form/OrgGovrnAbilityFormDTO.java     | 8 +++++++-
 .../indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java   | 6 +++++-
 .../indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml       | 3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityFormDTO.java
index 1534955c75..c2eadf4dc7 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityFormDTO.java
@@ -71,7 +71,13 @@ public class OrgGovrnAbilityFormDTO implements Serializable {
     private BigDecimal satisfactionRatio;
 
     /**
-     * 超期项目率
+     * 社区超期项目率，dataTyp=commnuity有值
      */
     private BigDecimal overdueProjectRatio;
+
+
+    /**
+     * 街道办结项目的处理效率, data_type=street时有值
+     */
+    private BigDecimal handleProjectRatio;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java
index a104561749..e23472c6a4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java
@@ -98,8 +98,12 @@ public class FactIndexGovrnAblityOrgMonthlyEntity extends BaseEpmetEntity {
 	private BigDecimal satisfactionRatio;
 
     /**
-     * 超期项目率
+     * 社区超期项目率，dataTyp=commnuity有值
      */
 	private BigDecimal overdueProjectRatio;
 
+	/**
+	 * 街道办结项目的处理效率, data_type=street时有值
+	 */
+	private BigDecimal handleProjectRatio;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml
index f47ef128f6..d91da41fea 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml
@@ -18,6 +18,7 @@
         <result property="closedProjectRatio" column="CLOSED_PROJECT_RATIO"/>
         <result property="satisfactionRatio" column="SATISFACTION_RATIO"/>
         <result property="overdueProjectRatio" column="OVERDUE_PROJECT_RATIO"/>
+        <result property="handleProjectRatio" column="HANDLE_PROJECT_RATIO"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -53,6 +54,7 @@
         CLOSED_PROJECT_RATIO,
         SATISFACTION_RATIO,
         OVERDUE_PROJECT_RATIO,
+        HANDLE_PROJECT_RATIO,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -76,6 +78,7 @@
             #{item.closedProjectRatio},
             #{item.satisfactionRatio},
             #{item.overdueProjectRatio},
+            #{item.handleProjectRatio},
             0,
             0,
             'APP_USER',