From 54d271cb931f95976993eb69b1b71b91c65ebcc8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 10:09:30 +0800
Subject: [PATCH] 增加秧苗方式，修正今年农资使用量为0的问题
---
src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 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..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
@@ -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,6 +37,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));
}
@@ -50,17 +52,22 @@
}
@Override
+ public IPage<FarmPlantVO> selectFarmPlantPageCount(IPage<Object> page, FarmPlantVO farmPlant) {
+ return baseMapper.selectFarmPlantPageCount(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 +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);
}
@@ -138,8 +145,8 @@
}
@Override
- public int selectCount() {
- return baseMapper.selectCount();
+ public int selectCount(FarmPlantVO farm) {
+ return baseMapper.selectCount(farm);
}
@Override
--
Gitblit v1.9.3