From 96624efd2e472c5b5a45a5f38d137bd89c92d7b7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 May 2022 17:13:33 +0800
Subject: [PATCH] 农事操作查询修改
---
src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java | 7 ++-----
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
index 3a0de47..c803f77 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -4,7 +4,7 @@
<!--自定义查询农场养殖记录分页数据-->
<select id="selectFarmPlantPage" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
- select sfp.*,ss.strain_name strainName,url,sl.land_name landName,sl.land_area area,land_unit landUnit from sys_farm_plant sfp
+ select sfp.*,ss.strain_name strainName,ss.url,sl.land_name landName,sl.land_area area,land_unit landUnit from sys_farm_plant sfp
left join sys_strain ss on ss.id = sfp.strain_id
left join sys_land sl on sl.id = sfp.land_id
where 1=1
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..83c5080 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
@@ -29,14 +29,11 @@
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);
--
Gitblit v1.9.3