From 77f2529af2d44b291ee97c439cbb010479985932 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 02 Jun 2022 17:40:28 +0800
Subject: [PATCH] 农事操作查询修改
---
src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 89466ef..346c179 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
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.farmplant.entity.FarmPlant;
+import org.springblade.modules.farmplant.entity.Strain;
import org.springblade.modules.farmplant.mapper.FarmPlantMapper;
import org.springblade.modules.farmplant.service.FarmPlantService;
import org.springblade.modules.farmplant.vo.FarmPlantVO;
+import org.springblade.modules.farmplant.vo.StrainVO;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -29,16 +32,47 @@
List<FarmPlantVO> farmPlantVOS = baseMapper.selectFarmPlantPage(page, farm);
//遍历
farmPlantVOS.forEach(farmPlantVO -> {
- if (farmPlantVO.getLandUnit().equals("0")){
- farmPlantVO.setArea(farmPlantVO.getArea()+"亩");
- }
if (farmPlantVO.getLandUnit().equals("1")){
- farmPlantVO.setArea(farmPlantVO.getArea()+"分");
+ farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea())*0.1));
}
if (farmPlantVO.getLandUnit().equals("2")){
- farmPlantVO.setArea(farmPlantVO.getArea()+"平方米");
+ farmPlantVO.setArea(String.format("%.2f",Double.parseDouble(farmPlantVO.getArea())*0.0015));
}
});
return page.setRecords(farmPlantVOS);
}
+
+ /**
+ * 农产品种养统计
+ * @param farm 农产品种植对象
+ * @param page 分页查询对象
+ * @return
+ */
+ @Override
+ 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());
+ }
+ });
+ return page.setRecords(farmPlantVOS);
+ }
+
+
+ /**
+ * 农产品列表
+ * @param farm 农产品对象
+ * @return
+ */
+ @Override
+ public List<Strain> strainTree(FarmPlantVO farm) {
+ return baseMapper.strainTree(farm);
+ }
}
--
Gitblit v1.9.3