From 529145876a560e2809f614369e3305a0ae537791 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Thu, 16 Dec 2021 18:46:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B2=BB=E7=90=86=E6=8C=87?=
 =?UTF-8?q?=E6=95=B0=EF=BC=88=E5=A4=A9=EF=BC=89=E3=80=81=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0=EF=BC=88=E5=A4=A9=EF=BC=89?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=A1=97=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ScreenAgencyGovernDailyResultDTO.java   | 14 ++++++++++++--
 .../result/ScreenGridGovernDailyResultDTO.java     | 12 +++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyGovernDailyResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyGovernDailyResultDTO.java
index f97b5ec..8dbea22 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyGovernDailyResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyGovernDailyResultDTO.java
@@ -120,7 +120,7 @@ public class ScreenAgencyGovernDailyResultDTO implements Serializable {
     private Integer inGroupTopicUnResolvedCount;
 
     /**
-     * 11、未出当前组织的，结案项目数
+     * （改）13、当前组织内结案的项目中：由网格结案的项目总数
      */
     private Integer gridSelfGovernProjectTotal;
 
@@ -135,7 +135,17 @@ public class ScreenAgencyGovernDailyResultDTO implements Serializable {
     private Integer streetClosedCount;
 
     /**
-     * 当前组织内出来的项目：由区直部门(已解决+未解决)结案的项目总数
+     * （改）16、当前组织内结案的项目中：由区直部门结案的项目总数
      */
     private Integer districtDeptClosedCount;
+
+    /**
+     * （新增）11、当前组织内：来源于事件的项目：结案已解决数
+     */
+    private Integer eventResolvedCount;
+
+    /**
+     * （新增）12、当前组织内：来源于事件的项目：结案无需解决数
+     */
+    private Integer eventUnResolvedCount;
 }
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridGovernDailyResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridGovernDailyResultDTO.java
index 1b75e4d..a48cc45 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridGovernDailyResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridGovernDailyResultDTO.java
@@ -135,7 +135,7 @@ public class ScreenGridGovernDailyResultDTO implements Serializable {
     private Integer fromAgencyUnResolvedInGridCount;
 
     /**
-     * 15、未出当前网格的，结案项目数=11+12+13+14
+     * （改）17、当前网格内出来的项目：由网格结案(已解决+未解决)的项目总数
      */
     private Integer gridSelfGovernProjectTotal;
 
@@ -153,4 +153,14 @@ public class ScreenGridGovernDailyResultDTO implements Serializable {
      * 当前网格内出来的项目：由区直部门(已解决+未解决)结案的项目总数
      */
     private Integer districtDeptClosedCount;
+
+    /**
+     * （新）15、当前网格内：来源于事件的项目：结案已解决数
+     */
+    private Integer eventResolvedCount;
+
+    /**
+     * （新）16、当前网格内：来源于事件的项目：结案无需解决数
+     */
+    private Integer eventUnResolvedCount;
 }