diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java index 5150bc1..e7379d2 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java @@ -350,7 +350,8 @@ public interface SysEnterpriseMapper extends BaseMapper { @Param("inherentRisk") Integer inherentRisk); /*街道企业*/ - List streetEntList(@Param("streetCode") String streetCode); + List streetEntList(@Param("streetCode") String streetCode, + @Param("condition") String condition); /*企业总数*/ Integer entNumByRiskLevel(@Param("areaCode") String areaCode, diff --git a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml index a2f810c..814ce97 100644 --- a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml @@ -2496,7 +2496,7 @@ SUM(case when be.HTState = '整改中' then 1 else 0 end ) rectifyingNum from SysEnterprise se left join BookEntHT be on se.SysEnterpriseId = be.SysEnterpriseId - where se.State = '启用' + where se.State = '启用' and se.EntName like #{condition} AND FIND_IN_SET(#{streetCode},se.area_path) 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 ad99f42..029fff3 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BigdataController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BigdataController.java @@ -594,11 +594,15 @@ public class BigdataController extends com.rzyc.controller.BaseController { @ApiOperation(value = "街道企业列表", notes = "街道企业列表") @GetMapping("/srteetEntList/{orgCode}") - @ApiImplicitParam(name = "orgCode",value = "地区id 默认传甘孜的地区id",required = true) + @ApiImplicitParams({ + @ApiImplicitParam(name = "orgCode",value = "地区id 默认传甘孜的地区id",required = true), + @ApiImplicitParam(name = "condition",value = "关键字") + }) @ResponseBody - public MultiResult srteetEntList(@PathVariable String orgCode)throws Exception{ + public MultiResult srteetEntList(@PathVariable String orgCode,String condition)throws Exception{ MultiResult result = new MultiResult<>(); - List streetEnts = sysEnterpriseMapper.streetEntList(orgCode); + condition = TypeConversion.getCondition(condition); + List streetEnts = sysEnterpriseMapper.streetEntList(orgCode,condition); result.setData(streetEnts); return result; }