From 53c3e169aa7176a9bf1dceb3dd0ea47d9bb6149f Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Wed, 30 Aug 2023 14:00:41 +0800
Subject: [PATCH] bug fix

---
 .../screen/domain/response/ZongzhiTbAreaResponse.java      | 6 +++++-
 .../resources/mapper/screen/ZongzhiScreenSaftyMapper.xml   | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java
index a826177..db320e8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java
@@ -31,7 +31,11 @@ public class ZongzhiTbAreaResponse {
     @ApiModelProperty(value = "统计数量")
     private Integer count;
 
-
+    /**
+     * 完整属地ID
+     */
+    @ApiModelProperty(value = "完整属地ID")
+    private String AreaId;
 
 
 
diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
index ebc42b2..09859df 100644
--- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
@@ -59,7 +59,8 @@
     </select>
     <select id="getTbArea" resultType="com.ruoyi.screen.domain.response.ZongzhiTbAreaResponse">
         SELECT
-        s.area_id AS areaId,
+        s.areaid AS areaId,
+        s.area_id as AreaId
         ROUND( COUNT( * ) * 100.0 / SUM( COUNT( * ) ) OVER ( ), 1 ) AS pt,
         count( * ) AS count
         FROM
@@ -70,7 +71,7 @@
         LOCATE( ',', area_id ) = 0 THEN
         TRIM( TRAILING ']' FROM SUBSTR( area_id, LOCATE( '[', area_id ) + 1 ) ) ELSE TRIM( TRAILING ']' FROM
         SUBSTRING_INDEX( area_id, ',', - 1 ) )
-        END AS area_id
+        END AS areaid,area_id
         FROM
         tc_tb
         WHERE
@@ -78,7 +79,7 @@
         AND area_id IS NOT NULL
         ) s
         GROUP BY
-        s.area_id
+        s.areaid
     </select>
     <select id="getTbDept" resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptResponse">
         SELECT COUNT(*) AS count, dep_name