From fe7876523baf9d6ef18f917d78098d7e9fbb0785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= <mythxb@qq.com>
Date: Thu, 16 Feb 2023 17:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=9A=90=E6=82=A3=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/check/BookEntHTMapper.xml     | 2 +-
 .../src/main/resources/mapper/ent/SysEnterpriseMapper.xml   | 4 ++--
 .../main/java/com/rzyc/controller/BigdataController.java    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml b/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml
index c4f0368..8126652 100644
--- a/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml
@@ -1617,7 +1617,7 @@
            left join SysEnterprise se on bc.BaseEntId = se.SysEnterpriseId
     where se.State = '启用'
       and YEAR(bt.CreatedOn)= YEAR(NOW())
-      and se.street_code = #{streetCode}
+      AND FIND_IN_SET(#{streetCode},se.area_path)
   </select>
 
   <select id="countDangerNum" resultType="java.lang.Integer">
diff --git a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
index 814ce97..0d5d429 100644
--- a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
@@ -2349,7 +2349,7 @@
     select count(*) from SysEnterprise se
     where se.State = '启用'
       <if test="null != areaCode and '' != areaCode">
-        and (se.OrgCode = #{areaCode} or se.street_code = #{areaCode} or se.community_code = #{areaCode})
+        AND FIND_IN_SET(#{areaCode},se.area_path)
       </if>
   </select>
 
@@ -2463,7 +2463,7 @@
     from BookEntCheck bc
     left join SysEnterprise se on bc.BaseEntId = se.SysEnterpriseId
     where se.State = '启用'
-        and se.street_code = #{streetCode}
+        AND FIND_IN_SET(#{streetCode},se.area_path)
     and YEAR(bc.CreatedOn)= YEAR(NOW())
     <if test="null != inherentRisk">
       and se.InherentRisk = #{inherentRisk}
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BigdataController.java b/inventory-gov/src/main/java/com/rzyc/controller/BigdataController.java
index 029fff3..cd64953 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/BigdataController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/BigdataController.java
@@ -75,7 +75,7 @@ public class BigdataController extends com.rzyc.controller.BaseController {
 
     @ApiOperation(value = "周检查情况", notes = "周检查情况")
     @GetMapping("/weekCheckInfo")
-    @ApiImplicitParam(name = "orgCode",value = "街道id 不传为街道检查信息 传为街道下社区检查信息")
+    @ApiImplicitParam(name = "orgCode",value = "地区id")
     @ResponseBody
     public MultiResult<WeekCheckInfo> weekCheckInfo(String orgCode)throws Exception{
         MultiResult<WeekCheckInfo> result = new MultiResult<>();
@@ -567,9 +567,9 @@ public class BigdataController extends com.rzyc.controller.BaseController {
         return controlCheck;
     }
 
-    @ApiOperation(value = "街道监督检查信息", notes = "街道监督检查信息")
+    @ApiOperation(value = "监督检查信息", notes = "监督检查信息")
     @GetMapping("/controlCheckStreet/{orgCode}")
-    @ApiImplicitParam(name = "orgCode",value = "街道id",required = true)
+    @ApiImplicitParam(name = "orgCode",value = "地区编号",required = true)
     @ResponseBody
     public SingleResult<ControlCheck> controlCheckStreet(@PathVariable String orgCode)throws Exception{
         SingleResult<ControlCheck> result = new SingleResult<>();