修改移动端议题和项目列表不显示已关闭事件

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<IssueDao, IssueEntity> 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());
 

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}
                 <![CDATA[ AND DATE_FORMAT(t1.DISTRIBUTE_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{someMonthsAgo}
                 <![CDATA[ AND DATE_FORMAT(t1.DISTRIBUTE_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}

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)
                 <if test="someMonthsAgo != null">
                     <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{someMonthsAgo}
                 </if>