From 6f7fd53b38334de7bf22618fb79a528103f5954c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 May 2022 14:02:34 +0800
Subject: [PATCH] 农产品库存查询修改，新增农产品操作统计
---
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
index 7d28661..b77b25e 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -136,6 +136,7 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入farmPlant")
+ @Transactional(rollbackFor = Exception.class)
public R update(@Valid @RequestBody FarmPlant farmPlant) {
boolean status = false;
//如果是结束
@@ -143,15 +144,16 @@
//更新
status = farmplantService.updateById(farmPlant);
//判断该地块是否还有种植的农产品
+ FarmPlant farmPlant2 = farmplantService.getById(farmPlant.getId());
FarmPlant farmPlant1 = new FarmPlant();
- farmPlant1.setLandId(farmPlant.getLandId());
+ farmPlant1.setLandId(farmPlant2.getLandId());
farmPlant1.setStatus("1");
List<FarmPlant> list = farmplantService.list(new QueryWrapper<>(farmPlant1));
if (list.size()<1){
//更新该地块的耕种状态
Land land = new Land();
land.setType(1);
- land.setId(Long.parseLong(farmPlant.getLandId()));
+ land.setId(Long.parseLong(farmPlant2.getLandId()));
landService.updateById(land);
}
}else {
@@ -183,4 +185,16 @@
return R.status(farmplantService.removeByIds(Func.toLongList(ids)));
}
+
+ /**
+ * 农产品种养统计
+ * @param farmPlantVO 农产品种植对象
+ * @param query 分页查询对象
+ * @return
+ */
+ @GetMapping("/getFarmPlantStatistics")
+ public R<IPage<FarmPlantVO>> getFarmPlantStatistics(FarmPlantVO farmPlantVO, Query query) {
+ return R.data(farmplantService.getFarmPlantStatistics(Condition.getPage(query),farmPlantVO));
+ }
+
}
--
Gitblit v1.9.3