Merge remote-tracking branch 'origin/dev_dingV1' into dev_dingV1

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

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -64,4 +65,16 @@ public class GovIssueDetailResultDTO implements Serializable {
      * */
     private Long votingDeadline;
 
+    public GovIssueDetailResultDTO() {
+        this.issueTitle = "";
+        this.issueStatus = "";
+        this.topicInfo = new GovTopicOfIssueInfoResultDTO();
+        this.issuePublisherMobile = "";
+        this.issueSuggestion = "";
+        this.belongsGridName = "";
+        this.issueInitiator = "";
+        this.sourceType = "";
+        this.projectId = "";
+        this.votingDeadline = NumConstant.ZERO_L;
+    }
 }

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

@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -53,4 +55,15 @@ public class GovTopicOfIssueInfoResultDTO implements Serializable {
      * 话题所属小组名称
      */
     private String groupName;
+
+    public GovTopicOfIssueInfoResultDTO() {
+        this.topicId = "";
+        this.topicContent = "";
+        this.photoList = new ArrayList<>();
+        this.topicPublisher = "";
+        this.topicPublishTime = NumConstant.ZERO_L;
+        this.topicPublisherMobile = "";
+        this.groupId = "";
+        this.groupName = "";
+    }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -645,7 +645,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     public GovIssueDetailResultDTO issueDetailGov(IssueDetailFormDTO issueParam) {
         //1.得到议题信息
         IssueEntity issueDetail = selectById(issueParam.getIssueId());
-
+        GovIssueDetailResultDTO issueInfo = new GovIssueDetailResultDTO();
         //2.1如果此条议题来源自话题
         if(StringUtils.equals(ModuleConstants.ISSUE_FROM_TOPIC,issueDetail.getSourceType())){
             GovTopicIssueInfoFormDTO topicParam = new GovTopicIssueInfoFormDTO();
@@ -657,7 +657,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             resiGroupFeignClient.topicInfoForIssueDetailGov(topicParam);
             if(topicResult.success() && null != topicResult.getData()){
                 GovTopicOfIssueInfoResultDTO topicInfo = ConvertUtils.sourceToTarget(topicResult.getData(),GovTopicOfIssueInfoResultDTO.class);
-                GovIssueDetailResultDTO issueInfo = ConvertUtils.sourceToTarget(topicResult.getData(),GovIssueDetailResultDTO.class);
+                issueInfo = ConvertUtils.sourceToTarget(topicResult.getData(),GovIssueDetailResultDTO.class);
                 issueInfo.setIssueStatus(issueDetail.getIssueStatus());
                 issueInfo.setIssueSuggestion(issueDetail.getSuggestion());
                 issueInfo.setIssueTitle(issueDetail.getIssueTitle());
@@ -672,6 +672,21 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 return issueInfo;
             }
             //查询话题失败异常
+        }else if (ModuleConstants.ISSUE.equals(issueDetail.getSourceType())){
+            issueInfo = ConvertUtils.sourceToTarget(issueDetail,GovIssueDetailResultDTO.class);
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(issueDetail.getGridId());
+            if(null == gridInfo){
+                throw new EpmetException("查询网格信息失败"+issueDetail.getGridId());
+            }
+            Result<List<UserBaseInfoResultDTO>> userResult = userOpenFeignClient.queryUserBaseInfo(Arrays.asList(issueDetail.getCreatedBy()));
+            if (!userResult.success() || CollectionUtils.isEmpty(userResult.getData())){
+                throw new EpmetException("查询居民信息失败");
+            }
+            UserBaseInfoResultDTO user = userResult.getData().get(NumConstant.ZERO);
+            issueInfo.setIssueInitiator(user.getShowName());
+            issueInfo.setIssuePublisherMobile(user.getMobile());
+            issueInfo.setBelongsGridName(gridInfo.getGridNamePath());
+            return issueInfo;
         }
 
         return null;