Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwFleetService.java

@@ -11,6 +11,7 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.fleet.api.RemoteFleetService;
 import com.sckw.report.model.vo.KwfCapacityVo;
 import com.sckw.system.api.RemoteUserService;
+import com.sckw.system.api.model.dto.req.QueryEntInfoByCityCodeAndEntTypesWithPageReqDto;
 import com.sckw.system.api.model.dto.res.KwsEnterpriseResDto;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
@@ -53,11 +54,15 @@ public class KwFleetService {
 
         // 企业数据查询
         List<KwfCapacityVo> list = new ArrayList<>();
-        Integer cityCode = NumberUtils.parseIntV1(params.get("cityCode"));
-        List<Integer> entTypes = new ArrayList<>(Arrays.asList(3, 4));
-        Integer page = PageResult.getPage(params);
-        Integer pageSize = PageResult.getPageSize(params);
-        PageResult pageResult = userService.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypes, entIds, page, pageSize);
+        int page = PageResult.getPage(params);
+        int pageSize = PageResult.getPageSize(params);
+        QueryEntInfoByCityCodeAndEntTypesWithPageReqDto queryPage = new QueryEntInfoByCityCodeAndEntTypesWithPageReqDto();
+        queryPage.setPage(page);
+        queryPage.setPageSize(pageSize);
+        queryPage.setEntTypeList(new ArrayList<>(Arrays.asList(3, 4)));
+        queryPage.setCityCode(NumberUtils.parseIntV1(params.get("cityCode")));
+        queryPage.setEntName(StringUtils.objectStr(params.get("firmName")));
+        PageResult pageResult = userService.queryEntInfoByCityCodeAndEntTypesWithPage(queryPage);
         List<KwsEnterpriseResDto> ents = JSON.parseArray(JSON.toJSONString(pageResult.getList()), KwsEnterpriseResDto.class);
         for (KwsEnterpriseResDto ent:ents) {
             KwfCapacityVo capacity = new KwfCapacityVo();