From fa326e87de2805d8b66b301daee596b1d959e430 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 11:42:45 +0800
Subject: [PATCH] 出入库记录删除回滚逻辑修改
---
src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 f7033ef..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,17 +39,43 @@
@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
- public Map<String, String> selctSaletCount(String year) {
- return baseMapper.selctSaletCount(year);
+ public Map<String, String> selctSaletCount(String farmId) {
+ return baseMapper.selctSaletCount(farmId);
}
@Override
- public List<Map<Object, String>> selctSaletZ() {
- return baseMapper.selctSaletZ();
+ public List<Map<Object, String>> selctSaletZ(SaleVO sale) {
+ return baseMapper.selctSaletZ(sale);
+ }
+
+ /**
+ * 统计市场流通/去年流通量/本月流通量
+ * @param sale
+ * @return
+ */
+ @Override
+ public List<Map<Object, String>> selectMarketCirculate(SaleVO sale) {
+ return baseMapper.selectMarketCirculate(sale);
+ }
+ @Override
+ public List<Map<Object, String>> selectMarketDistrict(String farmId,String startTime,String endTime) {
+ return baseMapper.selectMarketDistrict(farmId,startTime,endTime);
}
}
--
Gitblit v1.9.3