Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java

@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -49,4 +51,6 @@ public class IssueResultDTO implements Serializable {
      */
     private String gridName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date shiftIssueTime;
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -36,7 +36,8 @@
             issue_status AS issueStatus,
             suggestion AS issueSuggestion,
             grid_id AS gridId,
-            created_by AS userId
+            created_by AS userId,
+            CREATED_TIME as shiftIssueTime
         FROM
             issue
         WHERE

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.topic.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -90,4 +91,6 @@ public class ResiTopicIncludeIssueDetailResultDTO implements Serializable {
      * 话题被屏蔽详情
      */
     private TopicHiddenDetailDTO hiddenDetail;
+
+    private String gridName;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -885,6 +885,15 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         resultDTO.setReleaseAddress(topicDetail.getAddress());
         resultDTO.setTopicStatus(topicDetail.getStatus());
         resultDTO.setShiftIssueFlag(topicDetail.getShiftIssue());
+        ResiGroupEntity resiGroupEntity=resiGroupDao.selectById(topicDetail.getGroupId());
+        if(null!=resiGroupEntity){
+            CustomerGridFormDTO customerGridFormDTO=new CustomerGridFormDTO();
+            customerGridFormDTO.setGridId(resiGroupEntity.getGridId());
+            Result<CustomerGridDTO> gridInfoRes=govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
+            if(gridInfoRes.success()&&null!=gridInfoRes.getData()){
+                resultDTO.setGridName(gridInfoRes.getData().getGridNamePath());
+            }
+        }
         //2.查询话题附件
         QueryWrapper<ResiTopicAttachmentEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR);

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java

@@ -1,9 +1,11 @@
 package com.epmet.dto.result;
 
 import com.epmet.dto.TopicInfoDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -74,4 +76,7 @@ public class IssueDetailResultDTO implements Serializable {
      * 态度 - opposition（反对）support（赞成）
      */
     private String attitude;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date shiftIssueTime;
 }

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java

@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -44,5 +46,7 @@ public class IssueResultDTO implements Serializable {
      */
     private String topicId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date shiftIssueTime;
 
 }