Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

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 = "";
+
+
 }

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