From 52a29d9515a4e9cec9f5f975cb7566adca12540e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 12 Nov 2024 18:04:22 +0800
Subject: [PATCH] 新增附件信息导入，新增应急物资查询接口
---
src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 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..0b4e6f2 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;
/**
* 自定义分页查询
@@ -134,4 +142,28 @@
emergencySuppliesEntity.setSuppliesId(suppliesEntity.getId());
}
}
+
+ /**
+ * 获取应急物资信息
+ * @param emergencySupplies
+ * @return
+ */
+ @Override
+ public Map<String, Object> getEmergencySuppliesList(EmergencySuppliesVO emergencySupplies) {
+ Map<String, Object> map = new HashMap<>();
+ // 查询企业对应的应急物资信息
+ QueryWrapper<EmergencySuppliesEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("firm_id",emergencySupplies.getFirmId()).eq("is_deleted",0);
+ List<EmergencySuppliesEntity> list = list(wrapper);
+ 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