From b8f2c19b869986efa519f1846b63b11378147861 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Tue, 05 Nov 2024 22:11:27 +0800
Subject: [PATCH] 增加空间数据和基础接口及shp导入导出

---
 src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 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..60e2a39 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;
@@ -32,7 +33,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 +60,6 @@
 			// 数据转换
 			FirmInfo firmInfo = Objects.requireNonNull(BeanUtil.copy(firmInfoExcel, FirmInfo.class));
 			// 经纬度转换
-			System.out.println("firmInfo = " + firmInfo.getName());
 			positionConvert(firmInfo);
 			// 判断信息是否已录入
 			FirmInfo oldFirmInfo = isSave(firmInfo);

--
Gitblit v1.9.3