From 71d48e10cac41f8d66cf426a77c456cfc4b65aa0 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Tue, 29 Aug 2023 15:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=95=E8=AF=89=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=97=B6=E9=97=B4=E8=BF=94=E5=9B=9E=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcComplaintsDTO.java  |  5 +++++
 .../epmet/service/impl/IcComplaintsServiceImpl.java   | 11 +++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsDTO.java
index 254c4b142c..aff5c350a8 100755
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsDTO.java
@@ -60,4 +60,9 @@ public class IcComplaintsDTO implements Serializable {
      * 照片附件
      */
     private String[] imgs;
+
+    /**
+     * 上报时间
+     */
+    private String createdTime;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsServiceImpl.java
index 1a1c1ac138..14e302440f 100755
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -92,9 +93,12 @@ public class IcComplaintsServiceImpl extends BaseServiceImpl<IcComplaintsDao, Ic
     public IcComplaintsDTO get(String id) {
         IcComplaintsEntity entity = baseDao.selectById(id);
         IcComplaintsDTO result = ConvertUtils.sourceToTarget(entity, IcComplaintsDTO.class);
-        if (StringUtils.isNotEmpty(entity.getImgs())) {
+        if (null != entity.getImgs() && StringUtils.isNotEmpty(entity.getImgs())) {
             result.setImgs(entity.getImgs().split(","));
         }
+        if (null != entity.getCreatedTime()) {
+            result.setCreatedTime(DateUtil.formatDate(entity.getCreatedTime()));
+        }
         return result;
     }
 
@@ -178,9 +182,12 @@ public class IcComplaintsServiceImpl extends BaseServiceImpl<IcComplaintsDao, Ic
             entityList.forEach(entity -> {
                 result.forEach(dto -> {
                     if (entity.getId().equals(dto.getId())) {
-                        if(StringUtils.isNotEmpty(entity.getImgs())){
+                        if (StringUtils.isNotEmpty(entity.getImgs())) {
                             dto.setImgs(entity.getImgs().split(","));
                         }
+                        if (null != entity.getCreatedTime()) {
+                            dto.setCreatedTime(DateUtil.formatDate(entity.getCreatedTime()));
+                        }
                     }
                 });
             });