|
|
@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
|
|
|
import com.sckw.core.model.constant.Global;
|
|
|
import com.sckw.core.model.page.PageHelperUtil;
|
|
|
import com.sckw.core.model.page.PageResult;
|
|
|
+import com.sckw.core.utils.CollectionUtils;
|
|
|
import com.sckw.core.utils.NumberUtils;
|
|
|
import com.sckw.core.utils.StringUtils;
|
|
|
import com.sckw.fleet.api.RemoteFleetService;
|
|
|
@@ -50,6 +51,9 @@ public class KwFleetService {
|
|
|
if (capacityAmountMin != null || capacityAmountMax != null) {
|
|
|
List<Map<String, Object>> statistics = fleetService.capacityStatistics(entIds, capacityAmountMin, capacityAmountMax);
|
|
|
statistics.forEach(e -> entIds.add(NumberUtils.parseEmptyLong(e.get("entId"))));
|
|
|
+ if (CollectionUtils.isEmpty(entIds)) {
|
|
|
+ return new PageResult();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 企业数据查询
|
|
|
@@ -62,6 +66,7 @@ public class KwFleetService {
|
|
|
queryPage.setEntTypeList(new ArrayList<>(Arrays.asList(3, 4)));
|
|
|
queryPage.setCityCode(NumberUtils.parseIntV1(params.get("cityCode")));
|
|
|
queryPage.setEntName(StringUtils.objectStr(params.get("firmName")));
|
|
|
+ queryPage.setEntIdList(entIds);
|
|
|
PageResult pageResult = userService.queryEntInfoByCityCodeAndEntTypesWithPage(queryPage);
|
|
|
List<KwsEnterpriseResDto> ents = JSON.parseArray(JSON.toJSONString(pageResult.getList()), KwsEnterpriseResDto.class);
|
|
|
for (KwsEnterpriseResDto ent:ents) {
|
zk