From 32e81fa68cf76e2331eb88a2299ee0ecd8faa7b3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 22 Aug 2022 16:53:18 +0800
Subject: [PATCH] 修改为可以卖出全部产品

---
 src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java |   38 +++++++++++++++++++-------------------
 1 files changed, 19 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..630f043 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
@@ -59,15 +59,15 @@
 	@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 +82,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