From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改

---
 src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java |   63 ++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 23 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 92beff9..6ef4128 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
@@ -10,6 +10,7 @@
 import org.springblade.modules.farmplant.vo.FarmPlantVO;
 import org.springblade.modules.farmplant.vo.StrainVO;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -36,13 +37,14 @@
 		List<FarmPlantVO> farmPlantVOS = baseMapper.selectFarmPlantPage(page, farm);
 		//遍历
 		farmPlantVOS.forEach(farmPlantVO -> {
+			//面积单位(0: 亩 1:分 2：平方米)
 			if (farmPlantVO.getLandUnit().equals("0")) {
 				farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 1));
 			}
-			if (farmPlantVO.getLandUnit().equals("1")) {
+			else if (farmPlantVO.getLandUnit().equals("1")) {
 				farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.1));
 			}
-			if (farmPlantVO.getLandUnit().equals("2")) {
+			else if (farmPlantVO.getLandUnit().equals("2")) {
 				farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.0015));
 			}
 		});
@@ -50,17 +52,27 @@
 	}
 
 	@Override
+	public IPage<FarmPlantVO> selectFarmPlantPageCount(IPage<Object> page, FarmPlantVO farmPlant) {
+		return baseMapper.selectFarmPlantPageCount(page, farmPlant);
+	}
+
+	@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);
 	}
 
@@ -75,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);
 	}
 
@@ -138,8 +150,8 @@
 	}
 
 	@Override
-	public int selectCount() {
-		return baseMapper.selectCount();
+	public int selectCount(FarmPlantVO farm) {
+		return baseMapper.selectCount(farm);
 	}
 
 	@Override
@@ -196,4 +208,9 @@
 	public List<FarmPlantVO> getFarmPlantList(FarmPlantVO farmPlant) {
 		return baseMapper.getFarmPlantList(farmPlant);
 	}
+
+	@Override
+	public List<FarmPlantVO> getFarmPlantYMList(FarmPlantVO farmPlant) {
+		return baseMapper.getFarmPlantYMList(farmPlant);
+	}
 }

--
Gitblit v1.9.3