From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改
---
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 19359ee..3d515d0 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -13,6 +13,9 @@
import org.springblade.modules.farmplant.entity.FarmProductStock;
import org.springblade.modules.farmplant.service.FarmProductStockService;
import org.springblade.modules.farmplant.vo.FarmProductStockVO;
+import org.springblade.modules.process.service.IProcessService;
+import org.springblade.modules.processInv.entity.ProcessInv;
+import org.springblade.modules.processInv.service.IProcessInvService;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -31,6 +34,8 @@
public class FarmProductStockController extends BladeController {
private final FarmProductStockService farmProductStockService;
+ private final IProcessInvService processInvService;
+ private final IProcessService processService;
/**
* 详情
@@ -62,6 +67,15 @@
@ApiOperation(value = "分页", notes = "传入farmProductStock")
public R<IPage<FarmProductStockVO>> page(FarmProductStockVO farmProductStock, Query query) {
IPage<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPage(Condition.getPage(query), farmProductStock);
+ return R.data(pages);
+ }
+
+
+ @GetMapping("/strainCount")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入farmProductStock")
+ public R<IPage<FarmProductStockVO>> strainCount(FarmProductStockVO farmProductStock, Query query) {
+ IPage<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPagesCount(Condition.getPage(query), farmProductStock);
return R.data(pages);
}
@@ -188,7 +202,9 @@
//统计当前库存农产品
Map<String, String> sum = farmProductStockService.statisticsStock(year, farmId);
//统计当前库存加工产品
- Map<String, String> jgsum = null;
+// Map<String, String> jgsum = null;
+ Double jgsum = processInvService.statisticsStock(year,farmId);
+ Double jgNcl = processService.statistics(year,farmId);
if (sum != null){
map.put("sum",sum.get("sum"));
map.put("ncpNcl", sum.get("cssum"));
@@ -196,7 +212,7 @@
map.put("sum",0);
map.put("ncpNcl",0);
}
- map.put("jgsum",0);
+ map.put("jgsum",jgsum);
//农产品年产量统计
// List<Map<String, Double>> Nsum = farmProductStockService.statisticsYield(year, deptId);
@@ -205,7 +221,7 @@
//加工产品年产量统计
- map.put("jgNcl",0);
+ map.put("jgNcl",jgNcl);
return R.data(map);
}
@@ -217,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);
}
/**
@@ -236,4 +254,10 @@
return R.data(cssum);
}
+ @GetMapping("/getByLandId")
+ public R getByLandId(String strainId,String landId){
+ FarmProductStock farmProductStock = farmProductStockService.selectBy2Id(strainId,landId);
+ return R.data(farmProductStock);
+ }
+
}
--
Gitblit v1.9.3