把议题来源 放到“待处理”、“已驳回”、“已关闭”、“已转项目” 列表页中放到“提交人”列后面

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventsDTO.java

@@ -27,4 +27,8 @@ public class EpdcRejectEventsDTO implements Serializable {
      * 时间内容
      */
     private String eventContent;
+    /**
+     * 来源：话题名称或者‘党群议事’
+     */
+    private String groupName;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java

@@ -55,4 +55,9 @@ public class IssueWaitHandleOrClosedDTO implements Serializable {
      * 议题编号
      */
     private String issueCode;
+
+    /**
+     * 来源：话题名称或者‘党群议事’
+     */
+    private String groupName;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@@ -90,7 +90,12 @@
         temp.ID AS id,
         temp.NICK_NAME AS nickName,
         temp.CREATED_TIME AS createdTime,
-            temp.EVENT_CONTENT AS eventContent
+        temp.EVENT_CONTENT AS eventContent,
+        ( CASE
+        WHEN trim( temp.GROUP_NAME ) != ''
+        AND temp.GROUP_NAME IS NOT NULL
+        THEN temp.GROUP_NAME ELSE '党群议事'
+        END ) AS groupName
         FROM
         epdc_events temp
         WHERE
@@ -108,6 +113,14 @@
         <if test="communityId != null and communityId != ''">
             AND find_in_set(#{communityId},temp.PARENT_DEPT_IDS)
         </if>
+        <if test="source == 1">
+            and (trim(temp.GROUP_NAME) =''
+            or temp.GROUP_NAME is null )
+        </if>
+        <if test="source == 2">
+            and trim(temp.GROUP_NAME) !=''
+            and temp.GROUP_NAME is not null
+        </if>
         AND temp.EVENT_STATE = 2
         ORDER BY
         temp.CREATED_TIME DESC

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -13,7 +13,12 @@
         e.BROWSE_NUM AS browseNum,
         e.COMMENT_NUM AS commentNum,
         ( e.APPROVE_NUM + e.OPPOSE_NUM + e.BROWSE_NUM + e.COMMENT_NUM ) AS participateNum,
-            issue.ISSUE_CODE
+        issue.ISSUE_CODE,
+        ( CASE
+        WHEN trim( issue.GROUP_NAME ) != ''
+        AND issue.GROUP_NAME IS NOT NULL
+        THEN issue.GROUP_NAME ELSE '党群议事'
+        END ) AS groupName
         FROM
         epdc_issue issue
         LEFT JOIN epdc_events e ON issue.EVENT_ID = e.ID
@@ -39,6 +44,14 @@
         <if test="issueCode != null and issueCode != ''">
             AND issue.ISSUE_CODE like concat('%', #{issueCode}, '%')
         </if>
+        <if test="source == 1">
+            and (trim(issue.GROUP_NAME) =''
+            or issue.GROUP_NAME is null )
+        </if>
+        <if test="source == 2">
+            and trim(issue.GROUP_NAME) !=''
+            and issue.GROUP_NAME is not null
+        </if>
         ORDER BY
         issue.CREATED_TIME DESC
     </select>