From 54d271cb931f95976993eb69b1b71b91c65ebcc8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 10:09:30 +0800
Subject: [PATCH] 增加秧苗方式，修正今年农资使用量为0的问题
---
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 17 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 31f80af..3f1e60f 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -106,6 +106,18 @@
return R.data(pages);
}
+ /**
+ *首页当前种养产品总和
+ */
+ @GetMapping("/strainCount")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入farmPlant")
+ public R<IPage<FarmPlantVO>> strainCount(FarmPlantVO farmPlant, Query query) {
+ IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPageCount(Condition.getPage(query), farmPlant);
+ return R.data(pages);
+ }
+
+
/**
* 查询种养记录列表（不分页）
@@ -183,6 +195,10 @@
//直播
record.setType("11");
}
+ if(farmPlant.getPlantingWay().equals("2")){
+ //秧苗
+ record.setType("13");
+ }
record.setLandId(farmPlant.getLandId());
record.setOperator(farmPlant.getCreateUser());
record.setContent("品种: " + farmPlant.getVarieties());
@@ -230,6 +246,32 @@
}
//更新并返回
return R.status(status);
+ }
+
+ @PostMapping("/overAll")
+ public R overAll(@RequestBody FarmPlantVO farmPlantVO){
+ boolean status = false;
+ for (int i=0;i<farmPlantVO.getIds().length;i++){
+ FarmPlant farmPlant = new FarmPlant();
+ farmPlant.setId(farmPlantVO.getIds()[i]);
+ farmPlant.setEndPlantTime(farmPlantVO.getEndPlantTime());
+ farmPlant.setStatus("2");
+ status = farmplantService.updateById(farmPlant);
+ //判断该地块是否还有种植的农产品
+ FarmPlant farmPlant2 = farmplantService.getById(farmPlant.getId());
+ FarmPlant farmPlant1 = new FarmPlant();
+ 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(farmPlant2.getLandId()));
+ landService.updateById(land);
+ }
+ }
+ return R.data(status);
}
/**
@@ -389,24 +431,25 @@
*/
@GetMapping("/getFarmPlantStatisticsCountx")
public R getFarmPlantStatisticsCountx(FarmPlantVO farmPlant, Query query) {
- Double num = 0.0;
+// Double num = 0.0;
IPage<FarmPlantVO> pages = farmplantService.getFarmPlantStatisticsCountz(Condition.getPage(query), farmPlant);
- for (int i = 0; i < pages.getRecords().size(); i++) {
- String area = pages.getRecords().get(i).getArea();
- Double a = Double.parseDouble(area);
- DecimalFormat df = new DecimalFormat("#.00");
- String format = df.format(a);
- pages.getRecords().get(i).setArea(format);
- num += a;
- }
- Map map = new HashMap();
- List list = new ArrayList();
- DecimalFormat df = new DecimalFormat("#.00");
- String format = df.format(num);
- map.put("znum", format);
- list.add(map);
- list.add(pages);
- return R.data(list);
+// for (int i = 0; i < pages.getRecords().size(); i++) {
+// String area = pages.getRecords().get(i).getArea();
+// Double a = Double.parseDouble(area);
+// DecimalFormat df = new DecimalFormat("#.00");
+// String format = df.format(a);
+// pages.getRecords().get(i).setArea(format);
+// num += a;
+// }
+// Map map = new HashMap();
+// List list = new ArrayList();
+// DecimalFormat df = new DecimalFormat("#.00");
+// String format = df.format(num);
+// map.put("znum", format);
+// list.add(map);
+// list.add(pages);
+// return R.data(list);
+ return R.data(pages);
}
--
Gitblit v1.9.3