议题详情修改

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author zxc
@@ -15,7 +16,7 @@ import java.util.Date;
 public class IssueResultDTO implements Serializable {
 
     private static final long serialVersionUID = -1L;
-
+    private String issueId;
     /**
      * 议题标题
      */
@@ -53,4 +54,14 @@ public class IssueResultDTO implements Serializable {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date shiftIssueTime;
+
+    /**
+     * 来源类型 话题：resi_topic；直接立议题：issue；
+     */
+    private String sourceType;
+
+    /**
+     * 发布议题的图片
+     */
+    private List<String> issueImgs;
 }

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

@@ -9,6 +9,7 @@ import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.AchievementTypeEnum;
@@ -213,13 +214,15 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 		//议题信息
 		IssueResultDTO issueResult = issueDao.issueDetail(issueDetail);
         if (null != issueResult && StringUtils.isNotBlank(issueResult.getGridId())) {
-            BelongGridNameFormDTO formDTO = new BelongGridNameFormDTO();
+            /*BelongGridNameFormDTO formDTO = new BelongGridNameFormDTO();
             formDTO.setGridId(issueResult.getGridId());
             Result<BelongGridNameResultDTO> result = govOrgOpenFeignClient.getGridNameByGridId(formDTO);
             logger.info("根据网格id查询网格名称接口返参：" + JSON.toJSONString(result));
             if (result.success() && null != result.getData()) {
                 issueResult.setGridName(result.getData().getBelongsGridName());
-            }
+            }*/
+            GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(issueResult.getGridId());
+            issueResult.setGridName(null != gridInfoCache ? gridInfoCache.getGridNamePath() : StrConstant.EPMETY_STR);
         }
 		return issueResult;
 	}

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

@@ -28,21 +28,40 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <resultMap id="IssueResultDTOMap" type="com.epmet.dto.result.IssueResultDTO">
+        <id column="issueId" property="issueId" />
+        <result column="topicId" property="topicId"/>
+        <result column="issueTitle" property="issueTitle"/>
+        <result column="issueStatus" property="issueStatus"/>
+        <result column="issueSuggestion" property="issueSuggestion"/>
+        <result column="gridId" property="gridId"></result>
+        <result column="userId" property="userId"></result>
+        <result column="shiftIssueTime" property="shiftIssueTime"></result>
+        <result column="SOURCE_TYPE" property="sourceType"/>
+        <collection property="issueImgs" ofType="java.lang.String">
+            <result column="url"/>
+        </collection>
+    </resultMap>
     <!-- 议题详情 -->
-    <select id="issueDetail" parameterType="com.epmet.dto.form.IssueDetailFormDTO" resultType="com.epmet.dto.result.IssueResultDTO">
+    <select id="issueDetail" parameterType="com.epmet.dto.form.IssueDetailFormDTO" resultMap="IssueResultDTOMap">
         SELECT
-            source_id AS topicId,
+            i.id as issueId,
-            issue_title AS issueTitle,
+            i.source_id AS topicId,
-            issue_status AS issueStatus,
+            i.issue_title AS issueTitle,
-            suggestion AS issueSuggestion,
+            i.issue_status AS issueStatus,
-            grid_id AS gridId,
+            i.suggestion AS issueSuggestion,
-            created_by AS userId,
+            i.grid_id AS gridId,
-            CREATED_TIME as shiftIssueTime
+            i.created_by AS userId,
+            i.CREATED_TIME as shiftIssueTime,
+            i.SOURCE_TYPE,
+            ia.URL
         FROM
-            issue
+            issue i
+        left join issue_attachment ia
+        on(i.id=ia.BUSINESS_ID and ia.del_flag='0')
         WHERE
-            id = #{issueId}
+            i.id = #{issueId}
-            AND del_flag = 0
+            AND i.del_flag = 0
     </select>
 
     <select id="selectIssueListByGridId" parameterType="com.epmet.dto.form.ShiftProjectListFromDTO" resultType="com.epmet.entity.IssueEntity">

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

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author zxc
@@ -79,4 +80,14 @@ public class IssueDetailResultDTO implements Serializable {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date shiftIssueTime;
+
+    /**
+     * 来源类型 话题：resi_topic；直接立议题：issue；
+     */
+    private String sourceType;
+
+    /**
+     * 发布议题的图片
+     */
+    private List<String> issueImgs;
 }

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author zxc
@@ -49,4 +50,13 @@ public class IssueResultDTO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date shiftIssueTime;
 
+    /**
+     * 来源类型 话题：resi_topic；直接立议题：issue；
+     */
+    private String sourceType;
+
+    /**
+     * 发布议题的图片
+     */
+    private List<String> issueImgs;
 }