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

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

@@ -87,30 +87,43 @@
 
     <select id="selectListOfRejectEvents" resultType="com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO">
         SELECT
-            temp.ID AS id,
+        temp.ID AS id,
-            temp.NICK_NAME AS nickName,
+        temp.NICK_NAME AS nickName,
-            temp.CREATED_TIME AS createdTime,
+        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
+        epdc_events temp
         WHERE
-            temp.DEL_FLAG = '0'
+        temp.DEL_FLAG = '0'
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </if>
-            <if test="gridId != null and gridId != ''">
+        <if test="gridId != null and gridId != ''">
-                AND (temp.GRID_ID = #{gridId}
+            AND (temp.GRID_ID = #{gridId}
-                OR find_in_set(#{gridId},temp.ALL_DEPT_IDS))
+            OR find_in_set(#{gridId},temp.ALL_DEPT_IDS))
-            </if>
+        </if>
-            <if test="streetId != null and streetId != ''">
+        <if test="streetId != null and streetId != ''">
-                AND find_in_set(#{streetId},temp.PARENT_DEPT_IDS)
+            AND find_in_set(#{streetId},temp.PARENT_DEPT_IDS)
-            </if>
+        </if>
-            <if test="communityId != null and communityId != ''">
+        <if test="communityId != null and communityId != ''">
-                AND find_in_set(#{communityId},temp.PARENT_DEPT_IDS)
+            AND find_in_set(#{communityId},temp.PARENT_DEPT_IDS)
-            </if>
+        </if>
-            AND temp.EVENT_STATE = 2
+        <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
+        temp.CREATED_TIME DESC
     </select>
 
     <resultMap id="rejectEventDetailMap" type="com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO">

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

@@ -4,30 +4,35 @@
 <mapper namespace="com.elink.esua.epdc.modules.issue.dao.IssueDao">
     <select id="selectListOfIssueWaitHandleOrClosed" resultType="com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO">
         SELECT
-            issue.ID,
+        issue.ID,
-            issue.ISSUE_CONTENT AS issueContent,
+        issue.ISSUE_CONTENT AS issueContent,
-            e.CREATED_TIME AS createdTime,
+        e.CREATED_TIME AS createdTime,
-            e.NICK_NAME AS nickName,
+        e.NICK_NAME AS nickName,
-            e.APPROVE_NUM AS approveNum,
+        e.APPROVE_NUM AS approveNum,
-            e.OPPOSE_NUM AS opposeNum,
+        e.OPPOSE_NUM AS opposeNum,
-            e.BROWSE_NUM AS browseNum,
+        e.BROWSE_NUM AS browseNum,
-            e.COMMENT_NUM AS commentNum,
+        e.COMMENT_NUM AS commentNum,
-            ( e.APPROVE_NUM + e.OPPOSE_NUM + e.BROWSE_NUM + e.COMMENT_NUM ) AS participateNum,
+        ( 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
+        epdc_issue issue
-            LEFT JOIN epdc_events e ON issue.EVENT_ID = e.ID
+        LEFT JOIN epdc_events e ON issue.EVENT_ID = e.ID
-            AND e.DEL_FLAG = '0'
+        AND e.DEL_FLAG = '0'
         WHERE
-            issue.DEL_FLAG = '0'
+        issue.DEL_FLAG = '0'
-            and issue.ISSUE_STATE = #{state}
+        and issue.ISSUE_STATE = #{state}
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND DATE_FORMAT( issue.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+            AND DATE_FORMAT( issue.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
-            </if>
+        </if>
-            <if test="gridId != null and gridId != ''">
+        <if test="gridId != null and gridId != ''">
-                AND (issue.GRID_ID = #{gridId}
+            AND (issue.GRID_ID = #{gridId}
-                OR find_in_set(#{gridId},issue.ALL_DEPT_IDS))
+            OR find_in_set(#{gridId},issue.ALL_DEPT_IDS))
-            </if>
+        </if>
         <if test="streetId != null and streetId != ''">
             AND (find_in_set(#{streetId},issue.PARENT_DEPT_IDS)
             OR find_in_set(#{streetId},issue.ALL_DEPT_IDS))
@@ -36,11 +41,19 @@
             AND (find_in_set(#{communityId},issue.PARENT_DEPT_IDS)
             OR find_in_set(#{communityId},issue.ALL_DEPT_IDS))
         </if>
-            <if test="issueCode != null and issueCode != ''">
+        <if test="issueCode != null and issueCode != ''">
-                AND issue.ISSUE_CODE like concat('%', #{issueCode}, '%')
+            AND issue.ISSUE_CODE like concat('%', #{issueCode}, '%')
-            </if>
+        </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
+        issue.CREATED_TIME DESC
     </select>
 
     <resultMap id="waitHandleIssueDetailResultMap" type="com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO">