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}