1、大屏项目采集分类显示上级分类用-连接，多个分类用,分割

2、议题转项目V2接口发送积分事件

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java

@@ -176,7 +176,7 @@ public interface IssueService {
     List<IssueVoteStatisticalResultDTO> selectIssueVoteStatis(String customerId, String monthId);
 
     /**
-     * @Description 查找项目的分类名称 以-相连
+     * @Description 查找项目的分类名称 以-相连，以,分隔，
      * @param param
      * @return java.util.Map<java.lang.String,java.lang.String>
      * @author wangc

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.Issue.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.issue.StatsIssueDao;
 import com.epmet.dto.extract.result.IssueInfoResultDTO;
@@ -146,14 +147,22 @@ public class IssueServiceImpl implements IssueService {
         return statsIssueDao.selectIssueVoteStatis(customerId, dateId);
     }
 
+	/**
+	 * @Description 查找项目的分类名称 以-相连，以,分隔，
+	 * @param param
+	 * @return java.util.Map<java.lang.String,java.lang.String>
+	 * @author wangc
+	 * @date 2021.03.09 00:23
+	 */
 	@Override
 	public Map<String, String> getIntegratedProjectCategory(Map<String, Set<String>> param,String customerId) {
 		Map<String, String> map = new HashMap<>();
     	param.forEach((projectId,categoryIds) -> {
+    		//以下查询只适用于二级分类，如果分类层级变多了要修改此查询
 			List<IssueProjectCategoryDictDTO> categories = statsIssueDao.selectCategory(customerId, categoryIds);
 			if(!CollectionUtils.isEmpty(categories)){
 				StringBuilder str = new StringBuilder();
-				categories.forEach(category -> {str.append(category.getCategoryName()).append("-");});
+				categories.forEach(category -> {str.append(category.getCategoryName()).append(StrConstant.COMMA);});
 				map.put(projectId,str.substring(NumConstant.ZERO,str.length() - NumConstant.TWO));
 			}
 		});

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml

@@ -290,35 +290,15 @@
 
     <select id="selectCategory" resultType="com.epmet.dto.issue.IssueProjectCategoryDictDTO">
         SELECT
-            *
+        a.ID,
-        FROM (
+        IF(a.CATEGORY_TYPE = '2',concat(b.CATEGORY_NAME,'-',a.CATEGORY_NAME),a.CATEGORY_NAME) as categoryName
-
+        FROM issue_project_category_dict a
-        SELECT
+        LEFT JOIN issue_project_category_dict b on a.pid = b.id and a.customer_id = b.customer_id
-
+        WHERE a.DEL_FLAG = '0'
-        *
+        AND a.CUSTOMER_ID = #{customerId}
-
-        FROM issue_project_category_dict
-        WHERE DEL_FLAG = '0'
-        AND CUSTOMER_ID = #{customerId}
-        <foreach collection="ids" item="id" open="AND (" separator=" OR " close=")">
-            id = #{id}
-        </foreach>
-        UNION
-        SELECT
-
-        *
-
-        FROM issue_project_category_dict outter
-        WHERE outter.DEL_FLAG = '0'
-        AND outter.CUSTOMER_ID = 'default'
         <foreach collection="ids" item="id" open="AND (" separator=" OR " close=")">
-            outter.id = #{id}
+            a.id = #{id}
         </foreach>
-        AND NOT EXISTS (
+        order by a.category_type,a.sort
-        SELECT * FROM issue_project_category_dict WHERE del_flag = '0' AND
-        customer_id = #{customerId} and id = outter.id
-        )
-        ) temp
-        order by temp.category_type,temp.sort
     </select>
 </mapper>

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -1011,6 +1011,15 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }catch(RenException e){
             logger.error(e.getInternalMsg());
         }
+
+
+        //7:发送话题转议题积分事件
+        TopicEventFormDTO eventParam = new TopicEventFormDTO();
+        eventParam.setTopicId(entity.getSourceId());
+        eventParam.setEvent(EventEnum.TOPIC_SHIFTED_TO_PROJECT);
+        if(!resiGroupOpenFeignClient.sendEvent(eventParam).success()){
+            logger.warn("com.epmet.service.impl.IssueServiceImpl.shiftProjectV2，话题被转为项目积分事件发送失败，参数：{}", JSON.toJSONString(formDTO));
+        }
     }
 
     /**

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -493,6 +493,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
             if(null != existedStatistical && StringUtils.isNotBlank(existedStatistical.getId())){
                 toUpd.setId(existedStatistical.getId());
                 update(toUpd);
+            }else{
+                save(toUpd);
             }
         }