From dc365330c504f3a7cc88c42aef5f963b72509dee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 02 Aug 2022 17:14:29 +0800
Subject: [PATCH] 整合种植品种中相同品种的面积
---
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 c34add1..496120a 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -49,6 +49,7 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -101,7 +102,8 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入farmPlant")
public R<IPage<FarmPlantVO>> page(FarmPlantVO farmPlant, Query query) {
- IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
+// IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
+ IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPageCount(Condition.getPage(query), farmPlant);
return R.data(pages);
}
@@ -137,7 +139,9 @@
if (res.get(i).getStrainId().equals(count.get(j).getStrainId())){
FarmPlantVO data = new FarmPlantVO();
data.setStrainId(res.get(i).getStrainId());
- data.setArea((Double.parseDouble(res.get(i).getArea()) + Double.parseDouble(count.get(j).getArea()))+"");
+ BigDecimal b1 = new BigDecimal(res.get(i).getArea());
+ BigDecimal b2 = new BigDecimal(count.get(j).getArea());
+ data.setArea(b1.add(b2).doubleValue()+"");
data.setStrainName(res.get(i).getStrainName());
count.set(j,data);
type = false;
@@ -295,11 +299,41 @@
*/
@GetMapping("/pagePalnt")
public R pagePalnt(FarmPlantVO farmPlant, Query query) {
- int i = farmplantService.selectCount();
+ int num = farmplantService.selectCount(farmPlant);
IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
+ List<FarmPlantVO> res = pages.getRecords();
+ List<FarmPlantVO> count = new ArrayList<>();
+ //按种类合并种植物
+ for (int i = 0; i < res.size(); i++) {
+ if (i == 0){
+ count.add(res.get(0));
+ }else {
+ boolean type = false;
+ for (int j = 0; j < count.size(); j++) {
+ if (res.get(i).getStrainId().equals(count.get(j).getStrainId())){
+ FarmPlantVO data = new FarmPlantVO();
+ data.setStrainId(res.get(i).getStrainId());
+ BigDecimal b1 = new BigDecimal(res.get(i).getArea());
+ BigDecimal b2 = new BigDecimal(count.get(j).getArea());
+ data.setArea(b1.add(b2).doubleValue()+"");
+ data.setStrainName(res.get(i).getStrainName());
+ data.setUrl(res.get(i).getUrl());
+ count.set(j,data);
+ type = false;
+ break;
+ }else{
+ type = true;
+ }
+ }
+ if (type){
+ count.add(res.get(i));
+ }
+ }
+ }
+
Map map = new HashMap<>();
- map.put("num", i);
- map.put("page", pages);
+ map.put("num", num);
+ map.put("page", count);
return R.data(map);
}
--
Gitblit v1.9.3