From 6ecd2ab6dcad78dc520f4ff881ce37d258b635d6 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 05 Aug 2022 11:56:46 +0800
Subject: [PATCH] 根据品种id和农场id找到对应种养品种的地块

---
 src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
index aaf214f..1d69554 100644
--- a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
@@ -26,6 +26,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 /**
  * 销售记录表 服务实现类
@@ -38,7 +39,19 @@
 
 	@Override
 	public IPage<SaleVO> selectSalePage(IPage<SaleVO> page, SaleVO sale) {
-		return page.setRecords(baseMapper.selectSalePage(page, sale));
+
+		List<SaleVO> saleVO = baseMapper.selectSalePage(page, sale);
+		saleVO.forEach(new Consumer<SaleVO>() {
+			@Override
+			public void accept(SaleVO saleVO) {
+				if (saleVO.getCityName() != null) {
+					saleVO.setSaleDestination2(saleVO.getDistrict() + saleVO.getCityName() + saleVO.getCountyName());
+				}else {
+					saleVO.setSaleDestination2(saleVO.getDistrict());
+				}
+			}
+		});
+		return page.setRecords(saleVO);
 	}
 
 	@Override

--
Gitblit v1.9.3