From be9da335cb28e12e1439c24e4596f069e342d83f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 15:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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 90f57c1..4de5f47 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")
@@ -92,6 +102,14 @@
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);
+ }
+
/**
* 查询农事操作记录（不分页）
* @param farm
--
Gitblit v1.9.3