From 08609f7412d2ed23aa1e47afa604b44ac812277a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 02 Dec 2024 21:30:45 +0800
Subject: [PATCH] 物资查询修改（新增全景url返回）
---
src/main/java/org/springblade/modules/yw/service/impl/IndParkInfoServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/service/impl/IndParkInfoServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/IndParkInfoServiceImpl.java
index 6615e73..0f5f24d 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/IndParkInfoServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/IndParkInfoServiceImpl.java
@@ -6,6 +6,7 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.service.IRegionService;
+import org.springblade.modules.yw.entity.EmergencySpaceEntity;
import org.springblade.modules.yw.entity.IndParkInfoEntity;
import org.springblade.modules.yw.entity.RescueTeamEntity;
import org.springblade.modules.yw.excel.IndParkInfoExcel;
@@ -140,6 +141,8 @@
setRegionInfo(indParkInfoVO);
// 设置救援人员数量
indParkInfoVO.setRecNum(getRecNum());
+ // 设置应急池容量
+ indParkInfoVO.setEmePool(getEmePool());
// 设置风险企业数量
indParkInfoVO.setRiskFirmNum(getRiskFirmNum());
// 设置保护目标数量
@@ -151,11 +154,21 @@
}
/**
+ * 获取应急池容量
+ * @return
+ */
+ private String getEmePool() {
+ return emergencySpaceService.getEmePool();
+ }
+
+ /**
* 查询应急空间数量
* @return
*/
private Integer getSpaceNum() {
- return (int)emergencySpaceService.count();
+ QueryWrapper<EmergencySpaceEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0).ne("type",7);
+ return (int)emergencySpaceService.count(wrapper);
}
/**
--
Gitblit v1.9.3