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)
@@ -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())
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(String orgCode)throws Exception{
MultiResult 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 controlCheckStreet(@PathVariable String orgCode)throws Exception{
SingleResult result = new SingleResult<>();