diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java index 2dfdbd895..8ac176e3b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java @@ -60,4 +60,9 @@ public class IssueWaitHandleOrClosedDTO implements Serializable { * 来源:话题名称或者‘党群议事’ */ private String groupName; + + /** + * 项目状态 0-处理中,5-已关闭,10-已结案 + */ + private String itemState; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 9202ad3f0..ce898bf44 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -18,11 +18,13 @@ WHEN trim( issue.GROUP_NAME ) != '' AND issue.GROUP_NAME IS NOT NULL THEN issue.GROUP_NAME ELSE '党群议事' - END ) AS groupName + END ) AS groupName, + ei.ITEM_STATE as itemState FROM epdc_issue issue LEFT JOIN epdc_events e ON issue.EVENT_ID = e.ID AND e.DEL_FLAG = '0' + left join epdc_item ei on( issue.id=ei.ISSUE_ID and ei.del_flag='0') WHERE issue.DEL_FLAG = '0' and issue.ISSUE_STATE = #{state} @@ -52,6 +54,9 @@ and trim(issue.GROUP_NAME) !='' and issue.GROUP_NAME is not null + + and ei.ITEM_STATE=#{itemState} + ORDER BY issue.CREATED_TIME DESC