From 36fd62cfb9c484ab9f2a5ac205d129c37d4fbb12 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Tue, 30 Aug 2022 15:20:38 +0800
Subject: [PATCH] 优化登录相关
---
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 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 bd5112a..4b84822 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -117,6 +117,15 @@
return R.data(pages);
}
+ /**
+ * 首页秧苗产品总和
+ */
+ @GetMapping("/strainCountYM")
+ public R<IPage<FarmPlantVO>> strainCountYM(FarmPlantVO farmPlant, Query query) {
+ IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPageCountYM(Condition.getPage(query), farmPlant);
+ return R.data(pages);
+ }
+
/**
@@ -194,6 +203,10 @@
if (farmPlant.getPlantingWay().equals("1")) {
//直播
record.setType("11");
+ }
+ if(farmPlant.getPlantingWay().equals("2")){
+ //秧苗
+ record.setType("13");
}
record.setLandId(farmPlant.getLandId());
record.setOperator(farmPlant.getCreateUser());
@@ -427,24 +440,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