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/farmplant/controller/FarmProductStockController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
index fc8d666..3d515d0 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -233,12 +233,14 @@
public R statisticsStockMonth(String year,String farmId) {
//采收数量统计
- Map map = new HashMap();
+ Map<String,List<Map<String, String>>> map = new HashMap();
List<Map<String, String>> cssum = farmProductStockService.statisticsStockMonth(year, farmId);
//加工产品数量统计
- Map<String, String> jgsum = null;
+ List<Map<String, String>> jgsum = processService.statisticsMonth(year,farmId);
- return R.data(cssum);
+ map.put("csssum",cssum);
+ map.put("jgsum",jgsum);
+ return R.data(map);
}
/**
--
Gitblit v1.9.3