From 4564033dac9028476eb00c19ed245e42c244c804 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 23 Oct 2020 17:06:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenDifficultyDataDao.xml     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index a891aa0b11..9c1325f591 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -35,7 +35,8 @@
         <result property="eventTitle" column="eventTitle"/>
         <result property="eventSource" column="eventSource"/>
         <collection property="imgUrlList" ofType="java.lang.String">
-            <result property="EVENT_IMG_URL" column="imgUrl"/>
+            <result column="imgUrl"/>
+            <result column="id"/>
         </collection>
     </resultMap>
     <!-- 项目详情 -->
@@ -44,7 +45,8 @@
             dd.event_title AS eventTitle,
             dd.EVENT_CONTENT AS eventContent,
             dd.EVENT_SOURCE AS eventSource,
-            did.EVENT_IMG_URL AS imgUrl
+            did.EVENT_IMG_URL AS imgUrl,
+            did.id as id
         FROM
             screen_difficulty_data dd
             LEFT JOIN screen_difficulty_img_data did ON did.EVENT_ID = dd.EVENT_ID

From c80561d30acb36ccae1d28e1108fe1f39535ba0f Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 23 Oct 2020 17:07:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/project/dto/result/ProjectProcessResultDTO.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectProcessResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectProcessResultDTO.java
index 1c4be126dd..8a0d6e82ac 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectProcessResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectProcessResultDTO.java
@@ -17,7 +17,6 @@
 
 package com.epmet.project.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -56,8 +55,8 @@ public class ProjectProcessResultDTO implements Serializable {
     /**
      * 处理进展时间 字符串
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String processTimeStr;
+    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    //private String processTimeStr;
 
     /**
      * 处理部门
@@ -73,4 +72,6 @@ public class ProjectProcessResultDTO implements Serializable {
      * 内部备注
      */
     private String internalRemark = "";
+
+
 }
\ No newline at end of file