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/FirmInfoServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java
index 5eb89f4..a182447 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.DictBizCache;
import org.springblade.common.utils.PositionUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.yw.entity.FirmInfo;
@@ -11,9 +12,11 @@
import org.springblade.modules.yw.mapper.FirmInfoMapper;
import org.springblade.modules.yw.service.IFirmInfoService;
import org.springblade.modules.yw.vo.FirmInfoVO;
+import org.springblade.modules.yw.vo.SearchVO;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -32,7 +35,15 @@
*/
@Override
public IPage<FirmInfoVO> selectFirmInfoPage(IPage<FirmInfoVO> page, FirmInfoVO firmInfo) {
- return page.setRecords(baseMapper.selectFirmInfoPage(page,firmInfo));
+ List<FirmInfoVO> firmInfoVOS = baseMapper.selectFirmInfoPage(page, firmInfo);
+ for (FirmInfoVO firmInfoVO : firmInfoVOS) {
+ if (!Strings.isBlank(firmInfoVO.getCategory())){
+ firmInfoVO.setCategoryName(
+ DictBizCache.getValues("industry_category",firmInfoVO.getCategory())
+ );
+ }
+ }
+ return page.setRecords(firmInfoVOS);
}
/**
@@ -51,7 +62,6 @@
// 数据转换
FirmInfo firmInfo = Objects.requireNonNull(BeanUtil.copy(firmInfoExcel, FirmInfo.class));
// 经纬度转换
- System.out.println("firmInfo = " + firmInfo.getName());
positionConvert(firmInfo);
// 判断信息是否已录入
FirmInfo oldFirmInfo = isSave(firmInfo);
@@ -113,4 +123,32 @@
// 返回
return getOne(wrapper);
}
+
+ /**
+ * 自定义详情查询
+ * @param firmInfo
+ * @return
+ */
+ @Override
+ public FirmInfoVO getDetail(FirmInfoVO firmInfo) {
+ FirmInfoVO detail = baseMapper.getDetail(firmInfo);
+ // 设置类型解析
+ if (!Strings.isBlank(detail.getCategory())){
+ detail.setCategoryName(
+ DictBizCache.getValues("industry_category",detail.getCategory())
+ );
+ }
+ // 返回
+ return detail;
+ }
+
+ /**
+ * 模糊查询企业名称、应急空间名称、风险源名称
+ * @param firmInfo
+ * @return
+ */
+ @Override
+ public List<SearchVO> fuzzyQuery(FirmInfoVO firmInfo) {
+ return baseMapper.fuzzyQuery(firmInfo);
+ }
}
--
Gitblit v1.9.3