From a50990dee016e9dcb2f591ec66f32becb8808d36 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 31 Aug 2022 15:44:44 +0800
Subject: [PATCH] 大屏种养列表显示秧苗，后台采收不显示秧苗地块
---
src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 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..a216c2f 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
@@ -71,6 +71,16 @@
}
/**
+ * 获取农事记录详情带中文
+ * @param farmingRecordVO
+ * @return
+ */
+ @GetMapping("/details")
+ public R details(FarmingRecordVO farmingRecordVO){
+ return R.data(farmService.getDetails(farmingRecordVO));
+ }
+
+ /**
* 分页
*/
@GetMapping("/list")
@@ -89,6 +99,14 @@
@ApiOperation(value = "分页", notes = "传入farm")
public R<IPage<FarmingRecordVO>> page(FarmingRecordVO farm, Query query) {
IPage<FarmingRecordVO> pages = farmService.selectFarmingRecordPage(Condition.getPage(query), farm);
+ return R.data(pages);
+ }
+
+ @GetMapping("/pageNz")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入farm")
+ public R<IPage<FarmingRecordVO>> pageNz(FarmingRecordVO farm, Query query) {
+ IPage<FarmingRecordVO> pages = farmService.selectFarmingRecordPageByNz(Condition.getPage(query), farm);
return R.data(pages);
}
@@ -166,6 +184,8 @@
soldrService.dels(id);
} else {
soldrecordService.updateSold(amount1 - farm.getSnum(), id, detail.getCensus() - v);
+ detail.setAmount1(detail.getAmount1()-farm.getSnum());
+ soldrService.updateById(detail);
}
}
return R.status(farmService.save(farm));
@@ -209,8 +229,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 +240,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