From 7bc2c90d0523f8c5306c378154ee8fe4b099d72c Mon Sep 17 00:00:00 2001 From: liuchuang Date: Mon, 23 Sep 2019 17:27:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=92=8C=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=B7=B2=E5=85=B3=E9=97=AD=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/issue/service/impl/IssueServiceImpl.java | 2 +- .../src/main/resources/mapper/issue/IssueDao.xml | 2 +- .../src/main/resources/mapper/item/ItemDao.xml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index cec8c91c8..b9e6d8cd5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -167,7 +167,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp informationFormDTO.setUserId(entity.getUserId()); informationFormDTO.setContent(dto.getAdvice()); informationFormDTO.setType(EventsNoticeConstant.NOTICE_TYPE_PROGRESS_NOTICE); - informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ISSUE); + informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ITEM); informationFormDTO.setBusinessId(entity.getId()); informationFormDTO.setRelBusinessContent("议题："+entity.getIssueContent()); 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 d5d319b28..2833e3a13 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 @@ -194,7 +194,7 @@ ON t1.EVENT_ID = t2.ID AND t2.DEL_FLAG = '0' WHERE t1.DEL_FLAG = '0' - AND t1.ISSUE_STATE IN ( 0, 2 ) + AND t1.ISSUE_STATE = 0 AND t1.GRID_ID = #{deptId} = ]]> #{someMonthsAgo} #{timestamp} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index a7c96439a..158a2495c 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -51,8 +51,6 @@ WHEN 0 THEN '处理中' WHEN 5 THEN - '已关闭' - WHEN 10 THEN '已结案' ELSE '' END AS stateName FROM @@ -78,6 +76,7 @@ AND t2.DEL_FLAG = '0' WHERE t1.DEL_FLAG = '0' AND t1.GRID_ID = #{deptId} + AND t1.ITEM_STATE IN (0, 10) = ]]> #{someMonthsAgo}