From 4dff39db1e80e2c2dff1cf70f5ba9b199b5ebdc7 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Fri, 29 Jul 2022 11:36:27 +0800
Subject: [PATCH] 溯源码详情查询修改
---
src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
index 556f016..90f57c1 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
@@ -93,6 +93,16 @@
}
/**
+ * 查询农事操作记录（不分页）
+ * @param farm
+ * @return
+ */
+ @GetMapping("/getFarmingRecordList")
+ public R getFarmingRecordList(FarmingRecordVO farm) {
+ return R.data(farmService.getFarmingRecordListfarm(farm));
+ }
+
+ /**
* 新增
*/
@PostMapping("/save")
@@ -199,8 +209,8 @@
* @return
*/
@GetMapping("/getFarmingCount")
- public R getFarmingCount(String deptId) {
- return R.data(farmService.getFarmingCount(deptId));
+ public R getFarmingCount(String farmId) {
+ return R.data(farmService.getFarmingCount(farmId));
}
@@ -210,24 +220,24 @@
* @return
*/
@GetMapping("/getFarmingStatis")
- public R getFarmingStatis(String deptId) {
- return R.data(farmService.getFarmingStatis(deptId));
+ public R getFarmingStatis(String farmId) {
+ return R.data(farmService.getFarmingStatis(farmId));
}
/**
* 大屏农资使用概况统计
- *
+ * @param farmId 农场id
* @return
*/
@GetMapping("/getStockCount")
- public R getStockCount(String deptId) {
+ public R getStockCount(String farmId) {
//今年
- Double aDouble = farmService.selectJyCount(deptId);
+ Double aDouble = farmService.selectJyCount(farmId);
//去年
- Double aDouble1 = farmService.selectQyCount(deptId);
+ Double aDouble1 = farmService.selectQyCount(farmId);
//本月
- Double aDouble2 = farmService.selectByCount(deptId);
+ Double aDouble2 = farmService.selectByCount(farmId);
Map map = new HashMap();
map.put("jn", aDouble);
map.put("qn", aDouble1);
--
Gitblit v1.9.3