From 87a10b33a4f9c67d052af3bc855bbf823c60ce88 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Sat, 21 Oct 2023 14:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E7=BC=96?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reponse/ScreenSupervisionResponse.java    | 10 +++++--
 .../mapper/tcZz/netManage/ScreenMapper.xml    | 27 ++++++++++---------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/reponse/ScreenSupervisionResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/reponse/ScreenSupervisionResponse.java
index a48efa91..280dc335 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/reponse/ScreenSupervisionResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/reponse/ScreenSupervisionResponse.java
@@ -28,12 +28,18 @@ public class ScreenSupervisionResponse {
     @ApiModelProperty("政府网站")
     private Integer count2;
     /**
-     *监管单位、网站监测
+     *监管单位
      */
-    @ApiModelProperty("监管单位、网站监测")
+    @ApiModelProperty("监管单位")
     private Integer count3;
 
 
+    /**
+     *网站监测
+     */
+    @ApiModelProperty("网站监测")
+    private Integer count5;
+
     /**
      *IDC单位
      */
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml
index 09ac5468..150f9005 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml
@@ -6,25 +6,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getScreenSupervision" resultType="com.ruoyi.tcZz.domain.reponse.ScreenSupervisionResponse">
         SELECT *
-        FROM (SELECT COUNT(*) AS count FROM tc_dbxt WHERE isStatus=1) count,
-             (SELECT COUNT(*) AS count1 FROM tc_dbdw WHERE isStatus = 1) count1,
-             (SELECT COUNT(*) AS count2 FROM tc_zfwz WHERE isStatus = 1) count2,
-             (SELECT COUNT(*) AS count3 FROM tc_jgdw WHERE isStatus = 1) count3,
-             (SELECT COUNT(*) AS count4 FROM tc_idcdw WHERE isStatus = 1) count4;
+        FROM (SELECT COUNT(*) AS count FROM tc_dbxt WHERE isStatus=1 and area_id=1) count,
+             (SELECT COUNT(*) AS count1 FROM tc_dbdw WHERE isStatus = 1 and area_id=1) count1,
+             (SELECT COUNT(*) AS count2 FROM tc_zfwz WHERE isStatus = 1 and area_id=1) count2,
+             (SELECT COUNT(*) AS count3 FROM tc_jgdw WHERE isStatus = 1 and area_id=1 and type =1) count3,
+               (SELECT COUNT(*) AS count5 FROM tc_jgdw WHERE isStatus = 1 and area_id=1 and type =2) count5,
+             (SELECT COUNT(*) AS count4 FROM tc_idcdw WHERE isStatus = 1 and area_id=1) count4;
     </select>
     <select id="getScreenSource" resultType="com.ruoyi.tcZz.domain.reponse.ScreenSourceResponse">
         SELECT *
-        FROM (SELECT COUNT(*) AS count FROM tc_sjly where type =1) count,
-	(SELECT COUNT(*) AS count1 FROM tc_sjly where type=2) count1,
-  (SELECT COUNT(*) AS count2 FROM tc_xtjc  ) count2;
+        FROM (SELECT COUNT(*) AS count FROM tc_sjly where type =1 and area_id=1) count,
+	(SELECT COUNT(*) AS count1 FROM tc_sjly where type=2 and area_id=1) count1,
+  (SELECT COUNT(*) AS count2 FROM tc_xtjc  where area_id=1) count2;
     </select>
     <select id="getScreenOpinionReport" resultType="com.ruoyi.tcZz.domain.reponse.ScreenOpinionReportResponse">
         SELECT *
-        FROM (SELECT COUNT(*) AS count FROM tc_yqbg where type =1 and isStatus=1) count,
-	(SELECT COUNT(*) AS count1 FROM tc_yqbg where type=2 and isStatus=1) count1,
-  (SELECT COUNT(*) AS count2 FROM tc_yqbg where type=3 and isStatus=1 ) count2,
-	 (SELECT COUNT(*) AS count3 FROM tc_yqbg where type=4 and isStatus=1 ) count3,
-	  (SELECT COUNT(*) AS count4 FROM tc_yqbg where type=5 and isStatus=1 ) count4;
+        FROM (SELECT COUNT(*) AS count FROM tc_yqbg where type =1 and isStatus=1 and area_id=1) count,
+	(SELECT COUNT(*) AS count1 FROM tc_yqbg where type=2 and isStatus=1 and area_id=1) count1,
+  (SELECT COUNT(*) AS count2 FROM tc_yqbg where type=3 and isStatus=1 and area_id=1) count2,
+	 (SELECT COUNT(*) AS count3 FROM tc_yqbg where type=4 and isStatus=1 and area_id=1) count3,
+	  (SELECT COUNT(*) AS count4 FROM tc_yqbg where type=5 and isStatus=1 and area_id=1) count4;
     </select>
     <select id="getScreenArticles" resultType="com.ruoyi.tcZz.domain.reponse.ScreenArticlesResponse">
         SELECT *