From d18eb5bd8b9cf93ba7adb4ee97fdcaccd3838e79 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 Aug 2022 10:36:10 +0800
Subject: [PATCH] 删除回滚完善，销售损耗添加字段type、prodId、地块选择数据返回增加库存量和面积
---
src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java | 10 +++++++---
1 files changed, 7 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 2e52e92..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
@@ -44,7 +44,11 @@
saleVO.forEach(new Consumer<SaleVO>() {
@Override
public void accept(SaleVO saleVO) {
- saleVO.setSaleDestination2(saleVO.getDistrict()+saleVO.getCityName()+saleVO.getCountyName());
+ if (saleVO.getCityName() != null) {
+ saleVO.setSaleDestination2(saleVO.getDistrict() + saleVO.getCityName() + saleVO.getCountyName());
+ }else {
+ saleVO.setSaleDestination2(saleVO.getDistrict());
+ }
}
});
return page.setRecords(saleVO);
@@ -70,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