党群e事相关接口修改 返回事件标签

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

@@ -168,4 +168,9 @@ public class EpdcEventSubmitFormDTO implements Serializable {
      *是否提交为内容待审核状态
      */
     private Boolean isConReview;
+
+    /**
+     * 事件标签
+     */
+    private List<String> tagIds;
 }

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

@@ -49,4 +49,9 @@ public class EventAppDetailResultDTO implements Serializable {
      * 审核不通过意见
      */
     private String advice;
+
+    /**
+     * 事件标签
+     */
+    private List<String> tagNames;
 }

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

@@ -84,4 +84,9 @@ public class IssueDetailResultDTO implements Serializable {
      * 一级分类编码
      */
     private String firstCategoryCode;
+
+    /**
+     * 事件标签
+     */
+    private List<String> tagNames;
 }

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

@@ -78,4 +78,9 @@ public class IssueResultDTO implements Serializable {
      * 最热的一条评论
      */
     private IssueHotCommentResultDTO comment;
+
+    /**
+     * 事件标签
+     */
+    private List<String> tagNames;
 }

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

@@ -47,4 +47,9 @@ public class IssuesAndEventsOfMineResultDTO implements Serializable {
      * 最热的一条评论
      */
     private IssueHotCommentResultDTO comment;
+
+    /**
+     * 事件标签
+     */
+    private List<String> tagNames;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java

@@ -135,4 +135,9 @@ public class ItemDetailResultDTO implements Serializable {
      * 一级分类编码
      */
     private String firstCategoryCode;
+
+    /**
+     * 事件标签
+     */
+    private List<String> tagNames;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java

@@ -79,4 +79,9 @@ public class ItemResultDTO implements Serializable {
      * 最新进展
      */
     private ItemHandleProgressResultDTO latestProgress;
+
+    /**
+     * 事件标签
+     */
+    private List<String> tagNames;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EventTagRelationService.java

@@ -102,4 +102,15 @@ public interface EventTagRelationService extends BaseService<EventTagRelationEnt
      * @since 2020/9/2 13:41
      */
     Boolean checkTagRelationEvents(String tagId);
+
+    /**
+     * 保存事件标签
+     *
+     * @param tagIds 标签IDs
+     * @param eventId 事件ID
+     * @return void
+     * @author Liuchuang
+     * @since 2020/9/2 15:18
+     */
+    void saveEventTags(List<String> tagIds, String eventId);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -61,6 +61,7 @@ import com.elink.esua.epdc.modules.category.service.CategoryService;
 import com.elink.esua.epdc.modules.events.dao.EpdcEventsDao;
 import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
+import com.elink.esua.epdc.modules.events.service.EventTagRelationService;
 import com.elink.esua.epdc.modules.events.service.EventTagService;
 import com.elink.esua.epdc.modules.events.service.ImgService;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
@@ -123,6 +124,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
     @Autowired
     private EventTagService eventTagService;
 
+    @Autowired
+    private EventTagRelationService eventTagRelationService;
+
     @Override
     public PageData<EpdcEventsDTO> listOfPendingReviewEvents(Map<String, Object> params) {
         IPage<EpdcEventsDTO> page = getPage(params);
@@ -187,6 +191,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         // 保存图片
         imgService.saveImages(dto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_EVENTS);
 
+        // 保存事件标签
+        eventTagRelationService.saveEventTags(dto.getTagIds(), entity.getId());
+
         // 发送菜单消息-议题待回应
         this.sendMenuNoticeOfEventRespond(entity.getGridId(), null);
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EventTagRelationServiceImpl.java

@@ -32,6 +32,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -106,4 +107,20 @@ public class EventTagRelationServiceImpl extends BaseServiceImpl<EventTagRelatio
         return relationCount > NumConstant.ZERO;
     }
 
+    @Override
+    public void saveEventTags(List<String> tagIds, String eventId) {
+        if (null != tagIds && !tagIds.isEmpty() && StringUtils.isNotEmpty(eventId)) {
+            List<EventTagRelationEntity> entities = new ArrayList<>();
+            for (String tagId:
+                    tagIds) {
+                EventTagRelationEntity entity = new EventTagRelationEntity();
+                entity.setTagId(tagId);
+                entity.setEventId(eventId);
+                entities.add(entity);
+            }
+
+            insertBatch(entities);
+        }
+    }
+
 }

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

@@ -250,6 +250,9 @@
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
+        <collection property="tagNames" ofType="java.lang.String">
+            <result property="tagName" column="TAG_NAME"/>
+        </collection>
     </resultMap>
     <select id="selectOneOfEventDetail" resultMap="eventDetailResultMap">
         SELECT
@@ -261,12 +264,17 @@
             eve.NICK_NAME,
             eve.USER_FACE,
             eve.IS_PARTY_MEMBER,
-            img.IMG_URL
+            img.IMG_URL,
+            et.TAG_NAME
         FROM
             epdc_events eve
             LEFT JOIN epdc_img img ON eve.ID = img.REFERENCE_ID
             AND img.DEL_FLAG = '0'
             AND img.IMG_TYPE = 'events'
+            LEFT JOIN epdc_event_tag_relation etr ON etr.EVENT_ID = eve.ID
+            AND etr.DEL_FLAG = '0'
+            LEFT JOIN epdc_event_tag et ON etr.TAG_ID = et.ID
+            AND et.DEL_FLAG = '0'
         WHERE
             eve.DEL_FLAG = '0'
             AND eve.ID = #{eventId}

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

@@ -4,7 +4,7 @@
 <mapper namespace="com.elink.esua.epdc.modules.events.dao.EventTagDao">
 
     <select id="selectListOfEventTags" resultType="com.elink.esua.epdc.modules.events.entity.EventTagEntity">
-        SELECT t.ID, t.TAG_NAME FROM epdc_event_tag t WHERE t.DEL_FLAG = '0' AND t.ENABLE_FLAG = '1'
+        SELECT t.ID, t.TAG_NAME FROM epdc_event_tag t WHERE t.DEL_FLAG = '0' AND t.ENABLE_FLAG = '1' ORDER BY t.SORT
     </select>
 
 </mapper>

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

@@ -169,6 +169,9 @@
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
+        <collection property="tagNames" ofType="java.lang.String">
+            <result property="tagName" column="TAG_NAME"/>
+        </collection>
     </resultMap>
     <select id="selectListOfNewOrHotIssues" resultMap="newOrHotIssues">
         SELECT
@@ -192,7 +195,8 @@
         issue.DISTRIBUTE_TIME,
         ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum,
         img.IMG_URL,
-        issue.ISSUE_ADDRESS
+        issue.ISSUE_ADDRESS,
+        et.TAG_NAME
         FROM
         epdc_issue issue
         LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID
@@ -202,6 +206,10 @@
         AND eve.DEL_FLAG = '0'
         LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code
         AND cate.DEL_FLAG = '0'
+        LEFT JOIN epdc_event_tag_relation etr ON etr.EVENT_ID = issue.EVENT_ID
+        AND etr.DEL_FLAG = '0'
+        LEFT JOIN epdc_event_tag et ON etr.TAG_ID = et.ID
+        AND et.DEL_FLAG = '0'
         WHERE
         issue.ID IN (
             SELECT temp.ID FROM (
@@ -258,6 +266,9 @@
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
+        <collection property="tagNames" ofType="java.lang.String">
+            <result property="tagName" column="TAG_NAME"/>
+        </collection>
     </resultMap>
     <select id="selectOneIssueDetail" resultMap="issueDetailMap">
         SELECT
@@ -283,7 +294,8 @@
             WHEN 0 THEN
             true ELSE false
             END AS isOperational,
-            img.IMG_URL
+            img.IMG_URL,
+            et.TAG_NAME
         FROM
             epdc_issue issue
             LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID
@@ -291,6 +303,10 @@
             AND img.IMG_TYPE = 'events'
             LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID
             AND eve.DEL_FLAG = '0'
+            LEFT JOIN epdc_event_tag_relation etr ON etr.EVENT_ID = issue.EVENT_ID
+            AND etr.DEL_FLAG = '0'
+            LEFT JOIN epdc_event_tag et ON etr.TAG_ID = et.ID
+            AND et.DEL_FLAG = '0'
         <if test='userId != "" and userId != null'>
             LEFT JOIN epdc_event_user_attitude ua ON issue.EVENT_ID = ua.EVENT_ID
             AND ua.DEL_FLAG = '0'
@@ -389,6 +405,9 @@
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
+        <collection property="tagNames" ofType="java.lang.String">
+            <result property="tagName" column="TAG_NAME"/>
+        </collection>
     </resultMap>
     <select id="selectListOfIssuesAndEventsOfMine" resultMap="issuesAndEventsOfMineMap">
         SELECT
@@ -404,7 +423,8 @@
                 '未通过' ELSE ''
             END AS stateName,
             cate.CATEGORY_NAME,
-            img.IMG_URL
+            img.IMG_URL,
+            et.TAG_NAME
         FROM
             epdc_events eve
             LEFT JOIN epdc_img img ON eve.ID = img.REFERENCE_ID
@@ -412,6 +432,10 @@
             AND img.IMG_TYPE = 'events'
             LEFT JOIN epdc_category cate ON eve.FIRST_CATEGORY_CODE = cate.category_code
             AND cate.DEL_FLAG = '0'
+            LEFT JOIN epdc_event_tag_relation etr ON etr.EVENT_ID = eve.ID
+            AND etr.DEL_FLAG = '0'
+            LEFT JOIN epdc_event_tag et ON etr.TAG_ID = et.ID
+            AND et.DEL_FLAG = '0'
         WHERE
             eve.DEL_FLAG = '0'
             AND eve.EVENT_STATE IN ( 0, 2 )
@@ -429,7 +453,8 @@
                 '已关闭' ELSE ''
             END AS stateName,
             cate.CATEGORY_NAME,
-            img.IMG_URL
+            img.IMG_URL,
+            et.TAG_NAME
         FROM
             epdc_issue issue
             LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID
@@ -437,6 +462,10 @@
             AND img.IMG_TYPE = 'events'
             LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code
             AND cate.DEL_FLAG = '0'
+            LEFT JOIN epdc_event_tag_relation etr ON etr.EVENT_ID = issue.EVENT_ID
+            AND etr.DEL_FLAG = '0'
+            LEFT JOIN epdc_event_tag et ON etr.TAG_ID = et.ID
+            AND et.DEL_FLAG = '0'
         WHERE
             issue.DEL_FLAG = '0'
             AND issue.ISSUE_STATE IN ( 0, 2 )

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

@@ -27,6 +27,9 @@
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
+        <collection property="tagNames" ofType="java.lang.String">
+            <result property="tagName" column="TAG_NAME"/>
+        </collection>
     </resultMap>
     <select id="selectListOfItems" resultMap="itemsMap">
         SELECT
@@ -53,7 +56,8 @@
         '已关闭'
         WHEN 10 THEN
         '已结案' ELSE ''
-        END AS stateName
+        END AS stateName,
+        et.TAG_NAME
         FROM
         epdc_item item
         LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
@@ -66,6 +70,10 @@
         LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID
         AND hp.DEL_FLAG = '0'
         AND hp.CREATED_TIME = ( SELECT MAX( a.CREATED_TIME ) FROM epdc_item_handle_process a WHERE a.DEL_FLAG = '0' AND a.ITEM_ID = hp.ITEM_ID )
+        LEFT JOIN epdc_event_tag_relation etr ON etr.EVENT_ID = item.EVENT_ID
+        AND etr.DEL_FLAG = '0'
+        LEFT JOIN epdc_event_tag et ON etr.TAG_ID = et.ID
+        AND et.DEL_FLAG = '0'
         WHERE
         item.ID IN (
             SELECT temp.ID FROM (
@@ -214,7 +222,8 @@
         '已关闭'
         WHEN 10 THEN
         '已结案' ELSE ''
-        END AS stateName
+        END AS stateName,
+        et.TAG_NAME
         FROM
         epdc_item item
         LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
@@ -227,6 +236,10 @@
         LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID
         AND hp.DEL_FLAG = '0'
         AND hp.CREATED_TIME = ( SELECT MAX( a.CREATED_TIME ) FROM epdc_item_handle_process a WHERE a.DEL_FLAG = '0' AND a.ITEM_ID = hp.ITEM_ID )
+        LEFT JOIN epdc_event_tag_relation etr ON etr.EVENT_ID = item.EVENT_ID
+        AND etr.DEL_FLAG = '0'
+        LEFT JOIN epdc_event_tag et ON etr.TAG_ID = et.ID
+        AND et.DEL_FLAG = '0'
         WHERE
         item.ID IN (
         SELECT temp.ID FROM (
@@ -304,6 +317,9 @@
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
+        <collection property="tagNames" ofType="java.lang.String">
+            <result property="tagName" column="TAG_NAME"/>
+        </collection>
     </resultMap>
     <select id="selectOneItemDetail" resultMap="itemDetailMap">
         SELECT
@@ -340,7 +356,8 @@
             WHEN item.USER_ID = #{userId} AND item.EVALUATION_SCORE IS NULL THEN
             true ELSE false
             END AS isShowSatisfactionEvaluation,
-            img.IMG_URL
+            img.IMG_URL,
+            et.TAG_NAME
         FROM
             epdc_item item
             LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
@@ -348,6 +365,10 @@
             AND img.IMG_TYPE = 'events'
             LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
             AND eve.DEL_FLAG = '0'
+            LEFT JOIN epdc_event_tag_relation etr ON etr.EVENT_ID = item.EVENT_ID
+            AND etr.DEL_FLAG = '0'
+            LEFT JOIN epdc_event_tag et ON etr.TAG_ID = et.ID
+            AND et.DEL_FLAG = '0'
         <if test='userId != "" and userId != null'>
             LEFT JOIN epdc_event_user_attitude ua ON item.EVENT_ID = ua.EVENT_ID
             AND ua.DEL_FLAG = '0'