From a04c7a2993c81d39481059a6fb4efbdeb2084b7b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 10 Dec 2021 14:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java   | 8 ++++++++
 .../src/main/java/com/epmet/dao/IssueDao.java             | 2 +-
 .../java/com/epmet/service/impl/IssueServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/IssueDao.xml                | 7 ++++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java
index e954770cab..7349b7967b 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -33,4 +34,11 @@ public class ResiBuzzLeftPieChartResultDTO implements Serializable {
      * 颜色
      */
     private String colour;
+
+    public ResiBuzzLeftPieChartResultDTO() {
+        this.count = NumConstant.ZERO;
+        this.categoryCode = "";
+        this.categoryName = "";
+        this.colour = "";
+    }
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
index f7ef6c86f5..d81143c74c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
@@ -252,7 +252,7 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @author zxc
      * @date 2021/12/9 10:57 上午
      */
-    List<ResiBuzzLeftPieChartResultDTO> resiBuzzLeftPieChart(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("length")Integer length);
+    List<ResiBuzzLeftPieChartResultDTO> resiBuzzLeftPieChart(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("length")Integer length,@Param("customerId")String customerId);
 
     /**
      * @Description  查询组织下每个网格的项目数
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index e77be90639..3111b567b0 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -1631,7 +1631,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             formDTO.setOrgType(IssueConstant.ISSUE_AGENCY);
         }
         Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId());
-        List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length);
+        List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length, tokenDto.getCustomerId());
         if(CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
index 646fdd33e0..827f52b774 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
@@ -620,15 +620,16 @@
 
     <!-- 查询居民热议左侧饼图 -->
     <select id="resiBuzzLeftPieChart" resultType="com.epmet.dto.result.ResiBuzzLeftPieChartResultDTO">
-        SELECT COUNT(issueId) AS count,categoryCode,categoryName FROM
+        SELECT COUNT(issueId) AS count,categoryCode,categoryName,colour FROM
             (SELECT
                 i.ID AS issueId,
                 IFNULL(LEFT(ic.CATEGORY_CODE,#{length}),'') AS categoryCode,
-                IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName
+                IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName,
+                IFNULL(cd.colour,'#0091ed') AS colour
             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 = ic.CATEGORY_CODE AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.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='orgType == "grid" '>
                     AND i.GRID_ID = #{orgId}