From 7684b872a4ba519195bbe6c78660385ea64e84ff Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 26 Apr 2022 16:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=92=8C=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcExportTemplateDTO.java     | 5 +++++
 .../com/epmet/service/impl/IcExportTemplateServiceImpl.java  | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java
index 198c49a59f..cfb67b3782 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -61,4 +62,8 @@ public class IcExportTemplateDTO implements Serializable {
      */
 	private Integer sort;
     private Integer isSelf;
+
+    private String createdBy;
+
+    private Date createdTime;
 }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java
index 5bb93a162a..8b3c4da971 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java
@@ -266,6 +266,8 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
                 IcExportTemplateDTO dto = new IcExportTemplateDTO();
                 dto.setId(item.getId());
                 dto.setName(item.getName());
+                dto.setCreatedTime(item.getCreatedTime());
+                dto.setCreatedBy(staffInfo.getRealName());
                 if (tokenDto.getUserId().equals(item.getCreatedBy())) {
                     dto.setIsSelf(NumConstant.ONE);
                 } else {