From a1272d78844574b86645149a0d8ca257c2b8fe91 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 26 Dec 2024 09:43:14 +0800
Subject: [PATCH] 风险源统计等级空的设置为其他
---
src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 a90cdfe..646d715 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
@@ -12,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;
/**
@@ -36,9 +38,7 @@
List<FirmInfoVO> firmInfoVOS = baseMapper.selectFirmInfoPage(page, firmInfo);
for (FirmInfoVO firmInfoVO : firmInfoVOS) {
if (!Strings.isBlank(firmInfoVO.getCategory())){
- firmInfoVO.setCategoryName(
- DictBizCache.getValues("industry_category",firmInfoVO.getCategory())
- );
+ firmInfoVO.setCategoryName(firmInfoVO.getCategory());
}
}
return page.setRecords(firmInfoVOS);
@@ -60,7 +60,7 @@
// 数据转换
FirmInfo firmInfo = Objects.requireNonNull(BeanUtil.copy(firmInfoExcel, FirmInfo.class));
// 经纬度转换
- positionConvert(firmInfo);
+// positionConvert(firmInfo);
// 判断信息是否已录入
FirmInfo oldFirmInfo = isSave(firmInfo);
// 已存在并且不更新
@@ -139,4 +139,14 @@
// 返回
return detail;
}
+
+ /**
+ * 模糊查询企业名称、应急空间名称、风险源名称
+ * @param firmInfo
+ * @return
+ */
+ @Override
+ public List<SearchVO> fuzzyQuery(FirmInfoVO firmInfo) {
+ return baseMapper.fuzzyQuery(firmInfo);
+ }
}
--
Gitblit v1.9.3