From f0b49ea7a698f3dac0a93e0b8eec3975752bf34f Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 25 Aug 2022 17:47:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E6=97=A7?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dto/item/result/ItemResultDTO.java | 10 ++++++++++
 .../src/main/resources/mapper/item/ItemDao.xml         |  6 +++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
index e2b783da3..11417b757 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
@@ -80,6 +80,16 @@ public class ItemResultDTO implements Serializable {
      * 项目位置地址
      */
     private String address;
+
+    /**
+     * 诉求分类：0民生 1发展
+     */
+    private String peopleFlag;
+
+    /**
+     * 是否是诉求上报:0否1是
+     */
+    private String isPeople;
     /**
      * 最新进展
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index 61c5c1a3d..95615d6b4 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -22,6 +22,8 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="statementNum" column="statementNum"/>
         <result property="address" column="ISSUE_ADDRESS"/>
+        <result property="isPeople" column="IS_PEOPLE"/>
+        <result property="peopleFlag" column="PEOPLE_FLAG"/>
         <result property="latestProgress.progressName" column="stateName"/>
         <result property="latestProgress.createdTime" column="handleTime"/>
         <result property="latestProgress.advice" column="OUT_HANDLE_ADVICE"/>
@@ -55,7 +57,9 @@
         '已关闭'
         WHEN 10 THEN
         '已结案' ELSE ''
-        END AS stateName
+        END AS stateName,
+        item.IS_PEOPLE,
+        item.PEOPLE_FLAG
         FROM
         epdc_item item
         LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID