From 6e30c1a3f8ef0c4022bcfe1c3dc8169a6bd8368f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 22 Aug 2022 09:07:21 +0800
Subject: [PATCH] 修复小程序产量统计根据产业查询功能

---
 src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java b/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java
index 5c0f1dd..901cd47 100644
--- a/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java
@@ -24,6 +24,9 @@
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+import java.util.function.Consumer;
+
 /**
  * 库存出库记录表 服务实现类
  *
@@ -35,7 +38,18 @@
 
 	@Override
 	public IPage<RetrievalVO> selectRetrievalPage(IPage<RetrievalVO> page, RetrievalVO retrieval) {
-		return page.setRecords(baseMapper.selectRetrievalPage(page, retrieval));
+		List<RetrievalVO> retrievalVO = baseMapper.selectRetrievalPage(page, retrieval);
+		retrievalVO.forEach(new Consumer<RetrievalVO>() {
+			@Override
+			public void accept(RetrievalVO retrievalVO) {
+				if (retrievalVO.getCityName() != null) {
+					retrievalVO.setSaleDestination2(retrievalVO.getDistrict() + retrievalVO.getCityName() + retrievalVO.getCountyName());
+				}else {
+					retrievalVO.setSaleDestination2(retrievalVO.getDistrict());
+				}
+			}
+		});
+		return page.setRecords(retrievalVO);
 	}
 
 }

--
Gitblit v1.9.3