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

# Conflicts:
#	epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -5,22 +5,18 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IssueDTO;
 import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.MyPartIssuesResultDTO;
+import com.epmet.dto.result.MyPubIssuesAuditingResultDTO;
+import com.epmet.dto.result.SaveIssueSuggestionResultDTO;
 import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack;
 import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
 import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO;
 import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 

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

@@ -0,0 +1,8 @@
+package com.epmet.service;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/18 下午5:42
+ */
+public interface IssueAuditService {
+}

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

@@ -0,0 +1,17 @@
+package com.epmet.service.impl;
+
+import com.epmet.service.IssueAuditService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/18 下午5:42
+ */
+@Service
+@Slf4j
+public class IssueAuditServiceImpl implements IssueAuditService {
+
+
+
+}

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

@@ -17,7 +17,6 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.IssueConstant;
-import com.epmet.constant.OrgInfoConstant;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.IssueDao;
@@ -35,10 +34,10 @@ import com.epmet.entity.IssueProjectRelationEntity;
 import com.epmet.feign.*;
 import com.epmet.redis.GovIssueRedis;
 import com.epmet.redis.IssueVoteDetailRedis;
-import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
-import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
+import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
 import com.epmet.resi.group.dto.group.result.GroupClosedListResultDTO;
+import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupShiftProjectListResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
@@ -61,7 +60,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;

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

@@ -9,7 +9,8 @@
             ISSUE_TITLE,
             GRID_ID,
             topic_id,
-            CREATED_BY AS userId
+            CREATED_BY AS userId,
+            suggestion AS issueSuggestion
         FROM issue_application
         WHERE DEL_FLAG = '0'
           AND ID = #{issueApplicationId}

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

@@ -33,6 +33,8 @@ public class ApplicationDetailCopyResultDTO implements Serializable {
      */
     private String issuePublisher;
 
+    private String issueSuggestion;
+
     /**
      * 话题相关信息
      */
@@ -42,6 +44,7 @@ public class ApplicationDetailCopyResultDTO implements Serializable {
         this.issueApplicationId = "";
         this.issueTitle = "";
         this.gridName = "";
+        this.issueSuggestion = "";
         this.issuePublisher = "";
         this.topicInfo = new TopicInfoResultDTO();
     }

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

@@ -1,6 +1,5 @@
 package com.epmet.resi.group.dto.group.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -39,6 +38,8 @@ public class ApplicationDetailResultDTO implements Serializable {
      */
     private TopicInfoResultDTO topicInfo;
 
+    private String issueSuggestion;
+
     private String gridId;
 
     private String topicId;