From 1e159ffbf027d1c8a2de5a92ff257d3b02411415 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 06 Aug 2022 16:50:11 +0800
Subject: [PATCH] 修复使用农资后,已出库待使用农资数据不变。修复使用农资后还能删除出库数据

---
 src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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..ebf33a1 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,7 @@
 		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));
 			}
@@ -47,6 +48,11 @@
 			}
 		});
 		return page.setRecords(farmPlantVOS);
+	}
+
+	@Override
+	public IPage<FarmPlantVO> selectFarmPlantPageCount(IPage<Object> page, FarmPlantVO farmPlant) {
+		return baseMapper.selectFarmPlantPageCount(page, farmPlant);
 	}
 
 	@Override
@@ -138,8 +144,8 @@
 	}
 
 	@Override
-	public int selectCount() {
-		return baseMapper.selectCount();
+	public int selectCount(FarmPlantVO farm) {
+		return baseMapper.selectCount(farm);
 	}
 
 	@Override

--
Gitblit v1.9.3