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 | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 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 4dd6b28..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,30 @@
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")) {
+ 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> 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));
}
@@ -120,8 +144,8 @@
}
@Override
- public int selectCount() {
- return baseMapper.selectCount();
+ public int selectCount(FarmPlantVO farm) {
+ return baseMapper.selectCount(farm);
}
@Override
@@ -169,4 +193,13 @@
return baseMapper.selectProductf(code, time);
}
+ /**
+ * 查询种养记录列表（不分页）
+ * @param farmPlant
+ * @return
+ */
+ @Override
+ public List<FarmPlantVO> getFarmPlantList(FarmPlantVO farmPlant) {
+ return baseMapper.getFarmPlantList(farmPlant);
+ }
}
--
Gitblit v1.9.3