From f0040730a2e14e9a7f974bf736fbc896e0186b7b Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Mon, 29 Jan 2024 15:57:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BA=8B=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/modules/issue/dao/IssueDao.java      |  2 ++
 .../issue/service/impl/IssueServiceImpl.java       |  2 +-
 .../src/main/resources/mapper/issue/IssueDao.xml   | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
index 2501d754..34ead5d0 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
@@ -220,4 +220,6 @@ public interface IssueDao extends BaseDao<IssueEntity> {
     List<ScreenIssueCensusDTO> screenIssueCensusForQuarter(@Param("startDate")String startDate, @Param("endDate")String endDate);
 
     List<ScreenIssueCensusDTO> screenIssueCensusForYear(@Param("startDate")String startDate, @Param("endDate")String endDate);
+
+    List<ScreenLabelValueDTO> censusForScreen(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
index fdfaf918..5b6ed8db 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
@@ -790,6 +790,6 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
     @Override
     public List<ScreenLabelValueDTO> censusForScreen(Map<String, Object> params) {
-        return null;
+        return baseDao.censusForScreen(params);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
index c0838d7e..3ecc6de5 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -781,4 +781,18 @@
             date
 
     </select>
+    <select id="censusForScreen" resultType="com.elink.esua.epdc.dto.issue.result.ScreenLabelValueDTO">
+
+        SELECT
+            ca.category_name as label,
+            count(ca.category_name) as value
+        FROM
+            epdc_issue issue
+                LEFT JOIN epdc_category ca ON ca.category_code = issue.FIRST_CATEGORY_CODE AND ca.pid = 0
+        WHERE
+            issue.DEL_FLAG = '0'
+          and ca.category_name is not null
+        GROUP BY ca.category_name
+
+    </select>
 </mapper>