From 4e3463e23fa39543c1a468639ef20bdf1bbe8e3f Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 29 Apr 2020 17:47:58 +0800
Subject: [PATCH] =?UTF-8?q?addGrid=E6=97=B6=E7=9A=84pids=EF=BC=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=BB=84=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84date=E5=AD=97=E6=AE=B5=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8jsonFormat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/CustomerGridServiceImpl.java   | 11 ++++++++++-
 .../group/result/ApplyingGroupDetailResultDTO.java    |  2 ++
 .../src/main/resources/mapper/group/ResiGroupDao.xml  |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index ab835da389..97b02e57cd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -213,7 +213,16 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridEntity.setGridName(addGridFormDTO.getGridName());
         customerGridEntity.setManageDistrict(addGridFormDTO.getManageDistrict());
         customerGridEntity.setPid(addGridFormDTO.getAgencyId());
-        customerGridEntity.setPids(customerAgencyDTO.getPids());//查询所有上级组织id
+        if(StringUtils.isBlank(customerAgencyDTO.getPids())){
+            customerGridEntity.setPids(addGridFormDTO.getAgencyId());
+        }else{
+            if(customerAgencyDTO.getPids().endsWith(addGridFormDTO.getAgencyId())){
+                customerGridEntity.setPids(customerAgencyDTO.getPids());
+            }else{
+                customerGridEntity.setPids(customerAgencyDTO.getPids().concat(":").concat(addGridFormDTO.getAgencyId()));
+            }
+        }
+       //查询所有上级组织id
         baseDao.insert(customerGridEntity);
         //查询刚刚添加的gridId
         String gridId = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId(),null);
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java
index f8747baee9..f293407dc8 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.group.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,6 +39,7 @@ public class ApplyingGroupDetailResultDTO implements Serializable {
     /**
      * 申请时间
      * */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createdTime;
 
     /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 7f747fc16b..b00b98e86f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -262,7 +262,7 @@
 	gro.GROUP_HEAD_PHOTO AS groupHeadPhoto,
 	oper.READ_FLAG AS readFlag,
 	oper.MESSAGE_TEXT AS messageText,
-	DATE_FORMAT(oper.CREATED_TIME,'%Y-%d-%m %k:%i') AS createdTime,
+	oper.CREATED_TIME AS createdTime,
 	oper.STATE AS status,
 	oper.OPERATE_REASON rejectReason,
 	gro.CREATED_BY AS leaderId,