From 226a1a7bc561f594db195e4f1139d15448797bac Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 11 Aug 2022 09:38:58 +0800
Subject: [PATCH] 播种面积统计小数点保留三位，采收时地块选择重复数据过滤
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 2 +-
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 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 a0fda5d..86c9044 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -131,7 +131,7 @@
<!--自定义查询农场养殖记录分页数据-->
<select id="getFarmPlantStatistics" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
- select sfp.strain_id,ss.strain_name strainName,sum(sl.land_area) areas,land_unit landUnit from sys_farm_plant
+ select sfp.strain_id,ss.strain_name strainName,sum(TRUNCATE(sl.land_area,3)) areas,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
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index fc1ed16..5fad38d 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -229,7 +229,7 @@
</if>
</select>
<select id="getByStrainIdFarmId" resultType="org.springblade.modules.lang.entity.Land">
- SELECT land.id,land.land_name,land.url,land.farm_id
+ SELECT DISTINCT land.id,land.land_name,land.url,land.farm_id
FROM sys_land land
LEFT JOIN sys_farm_plant sfp ON sfp.land_id = land.id
WHERE sfp.strain_id = #{strainId}
--
Gitblit v1.9.3