From f8cc2aa0cb3f7973c6f0652fa2cc43b7c3d37785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Wed, 19 Nov 2025 15:23:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在种面积的值取整 --- .../module/farm/service/plotinfo/PlotInfoServiceImpl.java | 1 - .../service/productionplan/ProductionPlanServiceImpl.java | 5 ++--- .../src/main/resources/mapper/plotinfo/PlotInfoMapper.xml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoServiceImpl.java index 48a33087..6ebe175e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoServiceImpl.java @@ -307,7 +307,6 @@ public class PlotInfoServiceImpl implements PlotInfoService { @Override public List listPlotInfo(String baseId) { List pList = plotInfoMapper.listPlotInfo(baseId); - return pList; } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java index bf1906b6..a4b58e30 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java @@ -341,14 +341,13 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { if (ObjectUtils.isEmpty(planList)) { return null; } + double totalArea = planList.stream() .filter(Objects::nonNull) .filter(plan -> Objects.equals(plan.getPlanStatus(), PLAN_STATUS_2) || Objects.equals(plan.getPlanStatus(), PLAN_STATUS_6)) .mapToDouble(ProductionPlanDO::getPredictedArea) .sum(); - if (plotArea == null) { - return String.valueOf(totalArea); - } + if (ObjectUtils.isEmpty(totalArea)) { return "0 亩"; } else { diff --git a/yudao-module-farm/src/main/resources/mapper/plotinfo/PlotInfoMapper.xml b/yudao-module-farm/src/main/resources/mapper/plotinfo/PlotInfoMapper.xml index 97449d5d..7a4ad5c5 100644 --- a/yudao-module-farm/src/main/resources/mapper/plotinfo/PlotInfoMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/plotinfo/PlotInfoMapper.xml @@ -18,7 +18,7 @@ fpi.point AS point, fbi.name AS baseName, fpm.name AS manager, - COALESCE(SUM(fpp.predicted_area), 0) AS beingBaseArea, + COALESCE(FLOOR(SUM(fpp.predicted_area)), 0) AS beingBaseArea, GROUP_CONCAT(DISTINCT fsl.cultivar_name SEPARATOR ',') AS beingCropName FROM farm_plot_info fpi LEFT JOIN farm_base_info fbi ON fpi.base_id = fbi.id AND fbi.deleted = 0