表决中议题发布时间

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

@@ -19,7 +19,10 @@ public class VotingIssueListResultDTO implements Serializable {
      * 议题发布时间
      * */
     private Long issuePublishTime;
-
+    /**
+     * 议题发布时间
+     */
+    private String issuePublishTimeStr;
     /**
      * 议题Id
      * */

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

@@ -232,6 +232,7 @@
         <result column="issueTitle" property="issueTitle"/>
         <result column="suggestion" property="suggestion"/>
         <result column="issuePublishTime" property="issuePublishTime"/>
+        <result column="created_time" property="issuePublishTimeStr"/>
         <result column="sourceId" property="sourceId"/>
         <result column="sourceType" property="sourceType"/>
         <collection property="issueImgs" ofType="java.lang.String">
@@ -247,7 +248,8 @@
             UNIX_TIMESTAMP( i.created_time ) AS issuePublishTime,
             i.SOURCE_ID                    AS sourceId,
             i.SOURCE_TYPE as sourceType,
-            ia.url
+            ia.url,
+            DATE_FORMAT(i.created_time,'%Y-%m-%d %H:%i') as created_time
         FROM
             issue i
         left join  issue_attachment  ia
@@ -257,7 +259,7 @@
             AND i.GRID_ID = #{gridId}
             AND i.ISSUE_STATUS = 'voting'
         ORDER BY
-            i.created_time DESC,ia.SORT asc
+            i.created_time DESC
     </select>
 
     <resultMap id="ClosedIssueListResultDTOMap" type="com.epmet.dto.result.ClosedIssueListResultDTO">
@@ -291,7 +293,7 @@
             AND i.ISSUE_STATUS = 'closed'
             AND i.RESOLVE_TYPE = 'resolved'
         ORDER BY
-            i.created_time DESC,ia.sort asc
+            i.created_time DESC
     </select>
     <!-- 查询已关闭议题列表 政府端 -->
     <select id="selectClosedListGov" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultType="com.epmet.dto.result.ClosedIssueListGovResultDTO">

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

@@ -21,6 +21,10 @@ public class VotingIssueListResultDTO implements Serializable {
      * 议题发布时间
      * */
     private Long issuePublishTime;
+    /**
+     * 议题发布时间
+     */
+    private String issuePublishTimeStr;
 
     /**
      * 议题Id