From 257977f70bca9817f3ef34fae10cd75e4a424e4c Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Sun, 29 Sep 2019 15:12:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9F=A5=E7=9C=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/item/result/ItemContentForPCEndResultDTO.java    | 4 ++++
 .../src/main/resources/mapper/item/ItemDao.xml                | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java
index 3a24d3bba..d024fc2fa 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java
@@ -31,6 +31,10 @@ public class ItemContentForPCEndResultDTO implements Serializable {
      * 项目内容
      */
     private String itemContent;
+    /**
+     * 项目状态 0-处理中，5-已关闭，10-已结案
+     */
+    private Integer itemState;
     /**
      * 支持数
      */
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 984292701..557cf148e 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
@@ -345,6 +345,7 @@
         <result property="nickName" column="NICK_NAME"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="itemContent" column="ITEM_CONTENT"/>
+        <result property="itemState" column="ITEM_STATE"/>
         <result property="approveNum" column="APPROVE_NUM"/>
         <result property="opposeNum" column="OPPOSE_NUM"/>
         <result property="commentNum" column="COMMENT_NUM"/>
@@ -359,6 +360,7 @@
             item.NICK_NAME,
             item.DISTRIBUTE_TIME,
             item.ITEM_CONTENT,
+            item.ITEM_STATE,
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
             eve.COMMENT_NUM,