From 1afd95ff5b77a50242fabf29cf4f7d3a1111bc17 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Fri, 21 Feb 2020 10:41:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86--=E5=B7=B2?= =?UTF-8?q?=E8=BD=AC=E9=A1=B9=E7=9B=AE=20=E5=88=97=E8=A1=A8=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E5=8F=8A=E5=88=97?= =?UTF-8?q?=E2=80=9C=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java | 5 +++++ .../src/main/resources/mapper/issue/IssueDao.xml | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) 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