From 924cdc65ddca09d2da848bfe48d9aa520a1f4920 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 29 Apr 2021 09:50:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E8=BF=94=E5=8F=82=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E7=9C=8B=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ScreenProjectDistributionResultDTO.java    | 8 ++++++++
 .../main/resources/mapper/screen/ScreenProjectDataDao.xml | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
index 839870a4ab..ec2c9e5219 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
@@ -1,8 +1,10 @@
 package com.epmet.evaluationindex.screen.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @description:
@@ -29,4 +31,10 @@ public class ScreenProjectDistributionResultDTO implements Serializable {
      */
     private String longitude;
     private String latitude;
+
+
+    private String customerId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date projectCreateTime;
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index 2bb8be6086..7369a2a36c 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -10,7 +10,9 @@
             project_level AS level,
             project_id AS id,
             longitude AS longitude,
-            latitude AS latitude
+            latitude AS latitude,
+            PROJECT_CREATE_TIME AS projectCreateTime,
+            CUSTOMER_ID AS customerId
         FROM
             screen_project_data
         WHERE