From fa326e87de2805d8b66b301daee596b1d959e430 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 11:42:45 +0800
Subject: [PATCH] 出入库记录删除回滚逻辑修改
---
src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 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 f81a4b3..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
@@ -41,10 +41,10 @@
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));
}
});
@@ -57,17 +57,22 @@
}
@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);
}
@@ -82,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);
}
@@ -203,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