添加分类名

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author zxc
@@ -72,7 +74,7 @@ public class ResiBuzzDTO implements Serializable {
     /**
      * 分类名字
      */
-    private String categoryName;
+    private List<String> categoryName;
 
     public ResiBuzzDTO() {
         this.createdBy = "";
@@ -86,6 +88,13 @@ public class ResiBuzzDTO implements Serializable {
         this.oppositionCount = NumConstant.ZERO;
         this.voteAccount = "";
         this.issueOriginator = "";
-        this.categoryName = "其他";
+        this.categoryName = getDefaultCategoryName();
+    }
+
+    @JsonIgnore
+    public List<String> getDefaultCategoryName(){
+        List<String> list = new ArrayList<>();
+        list.add("其他");
+        return list;
     }
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java

@@ -1,6 +1,7 @@
 package com.epmet.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -23,6 +24,7 @@ public class ResiBuzzLeftPieChartResultDTO implements Serializable {
     /**
      * 分类编码
      */
+    @JsonIgnore
     private String categoryCode;
 
     /**

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@@ -234,7 +234,7 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @author zxc
      * @date 2021/12/8 4:08 下午
      */
-    List<ResiBuzzDTO> selectIssueLimit50(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("status")String status);
+    List<ResiBuzzDTO> selectIssueLimit50(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("status")String status,@Param("length")Integer length);
 
     /**
      * @Description  查询客户下1级分类的长度

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

@@ -1586,7 +1586,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             formDTO.setOrgId(staffInfo.getAgencyId());
             formDTO.setOrgType(IssueConstant.ISSUE_AGENCY);
         }
-        PageInfo<ResiBuzzDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus()));
+        Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId());
+        PageInfo<ResiBuzzDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus(),length));
         List<ResiBuzzDTO> list = pageInfo.getList();
         if (CollectionUtils.isEmpty(list)){
             return new ResiBuzzResultDTO();

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -579,22 +579,39 @@
     </select>
 
     <!-- 查询表决前50名 -->
-    <select id="selectIssueLimit50" resultType="com.epmet.dto.result.ResiBuzzDTO">
+    <resultMap id="selectIssueLimit50" type="com.epmet.dto.result.ResiBuzzDTO">
+        <result column="issueId" property="issueId"/>
+        <result column="issueTitle" property="issueTitle"/>
+        <result column="suggestion" property="suggestion"/>
+        <result column="createdBy" property="createdBy"/>
+        <result column="status" property="status"/>
+        <result column="createdTime" property="createdTime"/>
+        <result column="supportCount" property="supportCount"/>
+        <result column="oppositionCount" property="oppositionCount"/>
+        <result column="voteAccount" property="voteAccount"/>
+        <collection property="categoryName" ofType="java.lang.String">
+            <result column="cn"/>
+        </collection>
+    </resultMap>
+    <select id="selectIssueLimit50" resultMap="selectIssueLimit50">
         SELECT
             i.ID AS issueId,
-            i.ISSUE_TITLE,
-            i.SUGGESTION,
-            i.CREATED_BY,
+            i.ISSUE_TITLE AS issueTitle,
+            i.SUGGESTION AS suggestion,
+            i.CREATED_BY AS createdBy,
             (CASE WHEN i.ISSUE_STATUS = 'shift_project' THEN '已转项目'
                   WHEN i.ISSUE_STATUS = 'voting' THEN '表决中'
                   WHEN i.ISSUE_STATUS = 'closed' THEN '已关闭'
                   ELSE '表决中' END ) AS `status`,
-            i.CREATED_TIME,
-            s.SUPPORT_COUNT,
-            s.OPPOSITION_COUNT,
-            CONCAT(s.SUPPORT_COUNT + s.OPPOSITION_COUNT,'/',s.VOTABLE_COUNT) AS voteAccount
+            i.CREATED_TIME AS createdTime,
+            s.SUPPORT_COUNT AS supportCount,
+            s.OPPOSITION_COUNT AS oppositionCount,
+            CONCAT(s.SUPPORT_COUNT + s.OPPOSITION_COUNT,'/',s.VOTABLE_COUNT) AS voteAccount,
+            cd.CATEGORY_NAME as cn
         FROM issue i
         LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
+        LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID)
+        LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,#{length}) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID)
         WHERE i.DEL_FLAG = '0'
             <if test='status != "all" '>
                 AND i.ISSUE_STATUS = #{status}