Merge branch 'dev'

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;
 }

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;
     }
 
@@ -181,6 +185,9 @@ public class IcComplaintsServiceImpl extends BaseServiceImpl<IcComplaintsDao, Ic
                         if (StringUtils.isNotEmpty(entity.getImgs())) {
                             dto.setImgs(entity.getImgs().split(","));
                         }
+                        if (null != entity.getCreatedTime()) {
+                            dto.setCreatedTime(DateUtil.formatDate(entity.getCreatedTime()));
+                        }
                     }
                 });
             });