addGrid时的pids，查询创建小组申请详情的date字段使用jsonFormat

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

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;
 
     /**

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,