From fdff4ca4813fc77a9006309ed4e5c232b4f3c85e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 14:26:51 +0800
Subject: [PATCH] 返回数据新增农场全景地址
---
src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java | 18 +++++++++---------
1 files changed, 9 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 9e1a961..90f57c1 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
@@ -209,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));
}
@@ -220,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