From 3189f7c1615b1376013d76a55d4b9af74cf73d56 Mon Sep 17 00:00:00 2001
From: ASxx <2075995406@qq.com>
Date: Mon, 21 Aug 2023 15:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=AE=89=E5=85=A8=E7=9B=91?=
 =?UTF-8?q?=E7=AE=A1=E6=A3=80=E6=B5=8B=E5=93=8D=E5=BA=94=E7=B1=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/domain/response/ZongzhiDengbaoUnitResponse.java  | 4 ++--
 .../ruoyi/screen/domain/response/ZongzhiIdcResponse.java    | 4 ++--
 .../screen/domain/response/ZongzhiWorkDynamicsResponse.java | 2 +-
 .../screen/domain/response/ZongzhiZhengfuResponse.java      | 4 ++--
 .../resources/mapper/screen/ZongzhiScreenManageMapper.xml   | 2 +-
 .../resources/mapper/screen/ZongzhiScreenSaftyMapper.xml    | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoUnitResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoUnitResponse.java
index 3564849..bf9d698 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoUnitResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoUnitResponse.java
@@ -16,12 +16,12 @@ public class ZongzhiDengbaoUnitResponse {
      * 等保单位名称
      */
     @ApiModelProperty(value = "等保单位名称")
-    private String name1;
+    private String name;
 
     /**
      * 等保单位数量
      */
     @ApiModelProperty(value = "等保单位数量")
-    private int count1;
+    private int count;
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiIdcResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiIdcResponse.java
index 303e139..c9d55db 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiIdcResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiIdcResponse.java
@@ -16,12 +16,12 @@ public class ZongzhiIdcResponse {
      * IDC单位名称
      */
     @ApiModelProperty(value = "IDC单位名称")
-    private String name3;
+    private String name;
 
     /**
      * IDC单位数量
      */
     @ApiModelProperty(value = "IDC单位数量")
-    private int count3;
+    private int count;
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiWorkDynamicsResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiWorkDynamicsResponse.java
index c1f8338..0e79324 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiWorkDynamicsResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiWorkDynamicsResponse.java
@@ -17,7 +17,7 @@ public class ZongzhiWorkDynamicsResponse {
 
 
     @ApiModelProperty(value = "材料文件名称")
-    private String materialsName;
+    private String name;
 
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiZhengfuResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiZhengfuResponse.java
index 2abb802..6680e96 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiZhengfuResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiZhengfuResponse.java
@@ -15,12 +15,12 @@ public class ZongzhiZhengfuResponse {
      * 政府网站名称
      */
     @ApiModelProperty(value = "政府网站名称")
-    private String name2;
+    private String name;
 
     /**
      * 政府网站数量
      */
     @ApiModelProperty(value = "政府网站数量")
-    private int count2;
+    private int count;
 
 }
diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml
index feff147..27f5af6 100644
--- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml
@@ -6,7 +6,7 @@
 
 
     <select id="getWorkDynamics" resultType="com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse">
-        SELECT type, materials_name as materialsName
+        SELECT type, name
         FROM `tc_work_dongtai`
         GROUP BY type, materialsName
     </select>
diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
index ef5e30f..6b2aa1d 100644
--- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
@@ -45,15 +45,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(*) as count,'等保系统' as name from tc_dengbao_system
     </select>
     <select id="getDengbaoUnit" resultType="com.ruoyi.screen.domain.response.ZongzhiDengbaoUnitResponse">
-        select count(*) as count1, '等保单位' as name1
+        select count(*) as count, '等保单位' as name
         from tc_dengbao_unit
     </select>
     <select id="getZhengfu" resultType="com.ruoyi.screen.domain.response.ZongzhiZhengfuResponse">
-        select count(*) as count2, '政府网站' as name2
+        select count(*) as count, '政府网站' as name
         from tc_government_web
     </select>
     <select id="getIdc" resultType="com.ruoyi.screen.domain.response.ZongzhiIdcResponse">
-        select count(*) as count3, 'IDC单位' as name3
+        select count(*) as count, 'IDC单位' as name
         from tc_idc_unit
     </select>
 </mapper>
\ No newline at end of file