From a9a2d0f1d8d271985869dd2b26ac29217191ab51 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 10 Dec 2024 11:51:58 +0800
Subject: [PATCH] 应急空间新增字典，查询修改
---
src/main/java/org/springblade/modules/yw/service/impl/RescueTeamServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/service/impl/RescueTeamServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/RescueTeamServiceImpl.java
index 79ce731..841352a 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/RescueTeamServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/RescueTeamServiceImpl.java
@@ -16,6 +16,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -55,12 +56,12 @@
// 类型转换
if (!Strings.isBlank(rescueTeamExcel.getType())){
if (rescueTeamExcel.getType().equals("企业")){
- rescueTeamEntity.setType(1);
+ rescueTeamEntity.setType(2);
// 设置企业id
setFirmId(rescueTeamExcel,rescueTeamEntity);
}
if (rescueTeamExcel.getType().equals("园区")){
- rescueTeamEntity.setType(2);
+ rescueTeamEntity.setType(1);
}
}
// 判断是否保存
@@ -110,4 +111,19 @@
rescueTeamEntity.setFirmId(firmInfo.getId());
}
}
+
+ /**
+ * 救援队伍统计查询
+ * @param rescueTeam
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> getStatisticData(RescueTeamVO rescueTeam) {
+ if (null==rescueTeam.getType()){
+ // 设置默认为园区
+ rescueTeam.setType(1);
+ }
+ // 查询并返回救援队伍统计
+ return baseMapper.getStatisticData(rescueTeam);
+ }
}
--
Gitblit v1.9.3