From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作,种植记录查询新增,地块,溯源码查询修改

---
 src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 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 4dd6b28..92beff9 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
@@ -36,6 +36,24 @@
 		List<FarmPlantVO> farmPlantVOS = baseMapper.selectFarmPlantPage(page, farm);
 		//遍历
 		farmPlantVOS.forEach(farmPlantVO -> {
+			if (farmPlantVO.getLandUnit().equals("0")) {
+				farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 1));
+			}
+			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);
+	}
+
+	@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));
 			}
@@ -169,4 +187,13 @@
 		return baseMapper.selectProductf(code, time);
 	}
 
+	/**
+	 * 查询种养记录列表(不分页)
+	 * @param farmPlant
+	 * @return
+	 */
+	@Override
+	public List<FarmPlantVO> getFarmPlantList(FarmPlantVO farmPlant) {
+		return baseMapper.getFarmPlantList(farmPlant);
+	}
 }

--
Gitblit v1.9.3