diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 9bc48a612d..be1021439d 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1982,6 +1982,15 @@ public class IssueServiceImpl extends BaseServiceImpl imp result.setList(allIssueListResultDTOS); result.setTotal(allIssueListResultDTOS.size()); } + if (CollectionUtils.isNotEmpty(result.getList())){ + result.getList().forEach(l -> { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getGridId()); + if(null == gridInfo){ + throw new EpmetException("查询网格信息失败:"+l.getGridId()); + } + l.setGridName(gridInfo.getGridNamePath()); + }); + } return result; } } 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 06f323277a..effe000fe6 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 @@ -892,27 +892,27 @@ vs.OPPOSITION_COUNT FROM issue i LEFT JOIN issue_vote_statistical vs ON vs.ISSUE_ID = i.ID AND vs.DEL_FLAG = '0' - WHERE DEL_FLAG = '0' + WHERE i.DEL_FLAG = '0' - AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') >= #{startTime} + AND DATE_FORMAT(i.CREATED_TIME,'%Y%m%d') >= #{startTime} - AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') #{endTime} + AND DATE_FORMAT(i.CREATED_TIME,'%Y%m%d') #{endTime} - AND ISSUE_STATUS = #{issueStatus} + AND i.ISSUE_STATUS = #{issueStatus} - AND ISSUE_TITLE LIKE CONCAT('%',#{issueTitle},'%') + AND i.ISSUE_TITLE LIKE CONCAT('%',#{issueTitle},'%') - AND ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') + AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') - AND GRID_ID = #{orgId} + AND i.GRID_ID = #{orgId} - ORDER BY CREATED_TIME DESC + ORDER BY i.CREATED_TIME DESC \ No newline at end of file