From 2648880bec1583ce4fe1886de65300f0a22638d0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 26 Sep 2022 17:09:31 +0800
Subject: [PATCH] 更改种类描述的判断方式、溯源时地图详情sql调整、农资出库时删除数据回滚修复、大屏接受数据增加展示判断
---
src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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..7425509 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
@@ -61,8 +74,8 @@
return baseMapper.selectMarketCirculate(sale);
}
@Override
- public List<Map<Object, String>> selectMarketDistrict(String farmId) {
- return baseMapper.selectMarketDistrict(farmId);
+ public List<Map<Object, String>> selectMarketDistrict(String farmId,String startTime,String endTime) {
+ return baseMapper.selectMarketDistrict(farmId,startTime,endTime);
}
}
--
Gitblit v1.9.3