From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作，种植记录查询新增，地块，溯源码查询修改
---
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 1c039c1..dfbf22d 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -66,6 +66,17 @@
}
/**
+ * 自定义分页
+ */
+ @GetMapping("/pages")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入farmProductStock")
+ public R<List<FarmProductStockVO>> pages(FarmProductStockVO farmProductStock) {
+ List<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPages(farmProductStock);
+ return R.data(pages);
+ }
+
+ /**
* 统计产量
*
* @param farmProductStock
@@ -192,11 +203,22 @@
//采收数量统计
Map map = new HashMap();
- Map<String, String> cssum = farmProductStockService.statisticsStockMonth(year, deptId);
+ List<Map<String, String>> cssum = farmProductStockService.statisticsStockMonth(year, deptId);
//加工产品数量统计
Map<String, String> jgsum = null;
return R.data(cssum);
}
+ /**
+ * 农产品监管
+ */
+ @GetMapping("/productsSupervise")
+ public R productsSupervise(String year,String deptId) {
+
+ Map<String, String> cssum = farmProductStockService.productsSupervise(year, deptId);
+
+ return R.data(cssum);
+ }
+
}
--
Gitblit v1.9.3