From c11cb05c6f68d80d84e6c3840d4d8ecf7ccd28c1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 29 Aug 2022 14:35:33 +0800
Subject: [PATCH] 遥感同种类型默认只展示一个，遥感新增接口getSensings
---
src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
index f81a4b3..40e55bb 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
@@ -57,17 +57,22 @@
}
@Override
+ public IPage<FarmPlantVO> selectFarmPlantPageCountYM(IPage<Object> page, FarmPlantVO farmPlant) {
+ return baseMapper.selectFarmPlantPageCountYM(page, farmPlant);
+ }
+
+ @Override
public IPage<FarmPlantVO> getFarmPlantStatisticsCountz(IPage<FarmPlantVO> page, FarmPlantVO farm) {
List<FarmPlantVO> farmPlantVOS = baseMapper.getFarmPlantStatisticsCountz(page, farm);
- //遍历
- farmPlantVOS.forEach(farmPlantVO -> {
- if (farmPlantVO.getLandUnit().equals("1")) {
- farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.1));
- }
- if (farmPlantVO.getLandUnit().equals("2")) {
- farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.0015));
- }
- });
+// //遍历
+// farmPlantVOS.forEach(farmPlantVO -> {
+// if (farmPlantVO.getLandUnit().equals("1")) {
+// farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.1));
+// }
+// if (farmPlantVO.getLandUnit().equals("2")) {
+// farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.0015));
+// }
+// });
return page.setRecords(farmPlantVOS);
}
@@ -82,16 +87,16 @@
public IPage<FarmPlantVO> getFarmPlantStatistics(IPage<FarmPlantVO> page, FarmPlantVO farm) {
List<FarmPlantVO> farmPlantVOS = baseMapper.getFarmPlantStatistics(page, farm);
//遍历
- farmPlantVOS.forEach(farmPlantVO -> {
- if (farmPlantVO.getLandUnit().equals("1")) {
- BigDecimal bg = new BigDecimal(farmPlantVO.getAreas() * 0.1);
- farmPlantVO.setAreas(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
- }
- if (farmPlantVO.getLandUnit().equals("2")) {
- BigDecimal bg = new BigDecimal(farmPlantVO.getAreas() * 0.0015);
- farmPlantVO.setAreas(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
- }
- });
+// farmPlantVOS.forEach(farmPlantVO -> {
+// if (farmPlantVO.getLandUnit().equals("1")) {
+// BigDecimal bg = new BigDecimal(farmPlantVO.getAreas() * 0.1);
+// farmPlantVO.setAreas(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+// }
+// if (farmPlantVO.getLandUnit().equals("2")) {
+// BigDecimal bg = new BigDecimal(farmPlantVO.getAreas() * 0.0015);
+// farmPlantVO.setAreas(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+// }
+// });
return page.setRecords(farmPlantVOS);
}
--
Gitblit v1.9.3