From b1e8a099eb3117bcbd5f2e0c9a2eb0accabd8cbf Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 11 Feb 2025 08:56:46 +0800
Subject: [PATCH] 通过风险源点位分析三级防控点查询修改
---
src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
index 73496b5..9b57cd5 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
@@ -1,5 +1,6 @@
package org.springblade.modules.yw.service.impl;
+import com.aspose.cad.internal.J.W;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
@@ -7,9 +8,11 @@
import org.springblade.modules.yw.entity.EmergencySuppliesEntity;
import org.springblade.modules.yw.entity.FirmInfo;
import org.springblade.modules.yw.entity.SuppliesEntity;
+import org.springblade.modules.yw.entity.YwAttachEntity;
import org.springblade.modules.yw.excel.EmergencySuppliesExcel;
import org.springblade.modules.yw.service.IFirmInfoService;
import org.springblade.modules.yw.service.ISuppliesService;
+import org.springblade.modules.yw.service.IYwAttachService;
import org.springblade.modules.yw.vo.EmergencySuppliesVO;
import org.springblade.modules.yw.mapper.EmergencySuppliesMapper;
import org.springblade.modules.yw.service.IEmergencySuppliesService;
@@ -17,7 +20,9 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -34,6 +39,9 @@
@Autowired
private ISuppliesService suppliesService;
+
+ @Autowired
+ private IYwAttachService attachService;
/**
* 自定义分页查询
@@ -68,16 +76,16 @@
setFirm(emergencySuppliesExcel,emergencySuppliesEntity);
setSupplies(emergencySuppliesExcel,emergencySuppliesEntity);
// 查询是否已入库
- Long id = isSave(emergencySuppliesEntity);
+// Long id = isSave(emergencySuppliesEntity);
// 已入库
- if (null!=id){
- if (isCovered){
- emergencySuppliesEntity.setId(id);
- // 覆盖-更新
- updateById(emergencySuppliesEntity);
- continue;
- }
- }
+// if (null!=id){
+// if (isCovered){
+// emergencySuppliesEntity.setId(id);
+// 覆盖-更新
+// updateById(emergencySuppliesEntity);
+// continue;
+// }
+// }
// 保存
save(emergencySuppliesEntity);
}
@@ -126,7 +134,10 @@
QueryWrapper<SuppliesEntity> wrapper = new QueryWrapper<>();
wrapper.eq("name",emergencySuppliesExcel.getSuppliesName())
.eq("is_deleted",0);
- if (!emergencySuppliesExcel.getSuppliesName().contains("园区")){
+ if (!emergencySuppliesExcel.getSuppliesName().contains("园区")
+ && !emergencySuppliesExcel.getSuppliesName().contains("码头工业城")
+ && !emergencySuppliesExcel.getSuppliesName().contains("环境局")
+ ){
wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId());
}
SuppliesEntity suppliesEntity = suppliesService.getOne(wrapper);
@@ -134,4 +145,26 @@
emergencySuppliesEntity.setSuppliesId(suppliesEntity.getId());
}
}
+
+ /**
+ * 获取应急物资信息
+ * @param emergencySupplies
+ * @return
+ */
+ @Override
+ public Map<String, Object> getEmergencySuppliesList(EmergencySuppliesVO emergencySupplies) {
+ Map<String, Object> map = new HashMap<>();
+ // 查询企业对应的应急物资信息
+ List<EmergencySuppliesVO> list = baseMapper.getEmergencySuppliesList(emergencySupplies);
+ map.put("dataList",list);
+ // 查询企业对应应急物资的图片
+ QueryWrapper<YwAttachEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("firm_id",emergencySupplies.getFirmId()).eq("type",2).eq("is_deleted",0);
+ // 查询
+ List<YwAttachEntity> attachEntityList = attachService.list(queryWrapper);
+ // 设置
+ map.put("picList",attachEntityList);
+ // 返回
+ return map;
+ }
}
--
Gitblit v1.9.3