diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java index 6725684610..038d40a90d 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java +++ b/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 * */ diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 306a5c0204..77e9db60da 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -232,6 +232,7 @@ + @@ -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 @@ -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