From ad4e788fd50fdfb17090d9b6ffac889e3c4ad5ab Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Sun, 4 Sep 2022 16:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E6=89=A7?=
 =?UTF-8?q?=E6=B3=95=E8=AF=89=E6=B1=82=E8=AF=A6=E6=83=85=E5=A4=8D=E6=98=BE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/result/ItemAppealLawDetailResultDTO.java  |  3 ++-
 .../dto/item/result/ItemAppealPageResultDTO.java   | 14 ++++----------
 .../src/main/resources/mapper/item/ItemDao.xml     |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealLawDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealLawDetailResultDTO.java
index 493d1aef6..1811c7ac9 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealLawDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealLawDetailResultDTO.java
@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.item.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 @Data
@@ -87,7 +88,7 @@ public class ItemAppealLawDetailResultDTO implements Serializable {
     /**
      * 报到时间
      */
-    private String reportTime;
+    private Date reportTime;
 
     /**
      * 报到地点
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java
index 15e17672a..a60147b46 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java
@@ -3,7 +3,6 @@ package com.elink.esua.epdc.dto.item.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @program: esua-epdc
@@ -22,21 +21,16 @@ public class ItemAppealPageResultDTO implements Serializable {
     private String id;
 
     /**
-     * 用户昵称
+     * 提交人
      */
     private String nickName;
 
 
     /**
-     * 内容
+     * 项目内容
      */
     private String itemContent;
 
-    /**
-     * 发布时间
-     */
-    private Date distributeTime;
-
 
     /**
      * 网格
@@ -60,12 +54,12 @@ public class ItemAppealPageResultDTO implements Serializable {
 
 
     /**
-     * 诉求分类：0民生 1发展 2执法
+     * 诉求分类：0民生诉求 1发展诉求 2执法诉求
      */
     private String peopleFlag;
 
     /**
-     * 诉求分类：0民生 1发展 2执法
+     * 诉求分类：0民生诉求 1发展诉求 2执法诉求
      */
     private String peopleFlagName;
 
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 677014cbc..fe65f8337 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
@@ -1334,7 +1334,7 @@
             item.ITEM_VOICE,
             item.CONTACT_NAME
         FROM epdc_item item
-            LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
+            LEFT JOIN epdc_img img ON item.id = img.REFERENCE_ID
                         AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'items'
         WHERE
             item.DEL_FLAG = '0'