From 1d829b91fcfa295ecc3e32dd7c105fe372789065 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 13 Sep 2022 17:44:01 +0800
Subject: [PATCH] 农事记录content添加品种名称，大屏查询未删除数据，农产品投入
---
src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 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 89e1a44..8cfca56 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
@@ -29,6 +29,8 @@
import org.springblade.modules.farm.entity.FarmingRecord;
import org.springblade.modules.farm.service.FarmingRecordService;
import org.springblade.modules.farm.vo.FarmingRecordVO;
+import org.springblade.modules.farmplant.entity.Strain;
+import org.springblade.modules.farmplant.service.StrainService;
import org.springblade.modules.soldr.entity.Soldr;
import org.springblade.modules.soldr.service.ISoldrService;
import org.springblade.modules.soldrecord.service.ISoldrecordService;
@@ -58,7 +60,7 @@
private final ISoldrService soldrService;
private final ISoldrecordService soldrecordService;
private final IStockfactoryService stockfactoryService;
-
+ private final StrainService strainService;
/**
* 详情
*/
@@ -68,6 +70,16 @@
public R<FarmingRecord> detail(FarmingRecord farm) {
FarmingRecord detail = farmService.getOne(Condition.getQueryWrapper(farm));
return R.data(detail);
+ }
+
+ /**
+ * 获取农事记录详情带中文
+ * @param farmingRecordVO
+ * @return
+ */
+ @GetMapping("/details")
+ public R details(FarmingRecordVO farmingRecordVO){
+ return R.data(farmService.getDetails(farmingRecordVO));
}
/**
@@ -89,6 +101,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);
}
@@ -159,13 +179,16 @@
stockfactory.setId(ids);
Stockfactory detailstock = stockfactoryService.getOne(Condition.getQueryWrapper(stockfactory));
String agriculturalName = detailstock.getAgriculturalName();
- String content = agriculturalName + " " + v + "公斤";
+ Strain strain = strainService.getById(farm.getStrainId());
+ String content =strain.getStrainName()+"-"+ agriculturalName + " " + v + "公斤";
farm.setContent(content);
//使用农资数量等于已出农资数量
if (farm.getSnum() == detail.getAmount1()) {
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 +232,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,8 +243,8 @@
* @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));
}
--
Gitblit v1.9.3