From 7bbc4cc6167cbc98138ce46abc63a201547e8211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Sun, 31 Aug 2025 13:42:16 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E5=9F=BA=E5=9C=B0=E7=AE=A1?= =?UTF-8?q?=E7=90=86,=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 编辑基地 - 计划ID --- .../admin/cropFarmingCenter/vo/ProductionPlanResp2VO.java | 2 ++ .../module/farm/service/baseinfo/BaseInfoServiceImpl.java | 5 ++++- .../cropFarmingCenter/CropFarmingCenterServiceImpl.java | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanResp2VO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanResp2VO.java index fa123fa3..b0dfcd58 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanResp2VO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanResp2VO.java @@ -32,6 +32,8 @@ public class ProductionPlanResp2VO { private String text; @Schema(description = "地块数量") private int size; + @Schema(description = "计划ID") + private String planId; @Schema(description = "计划编号") private String planNumber; @Schema(description = "种植物种-编码") diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java index 70f8bfeb..ab7d9ed8 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java @@ -77,11 +77,14 @@ public class BaseInfoServiceImpl implements BaseInfoService { BaseInfoDO sourceBaseInfoDO = baseInfoMapper.selectById(baseId); BigDecimal oldArea = sourceBaseInfoDO.getArea(); BigDecimal newArea = updateReqVO.getArea(); + if (oldArea.compareTo(newArea) == 0) { + return ; + } // 更新 BaseInfoDO updateObj = BeanUtils.toBean(updateReqVO, BaseInfoDO.class); baseInfoMapper.updateById(updateObj); // 同步 - productionPlanService.syncBaseAreaToAllPlansByBaseId(baseId, newArea, oldArea); +// productionPlanService.syncBaseAreaToAllPlansByBaseId(baseId, newArea, oldArea); } @Override diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java index cf51c469..abd43828 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java @@ -318,6 +318,7 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { subNode.setText(speciesNameMap.get(subPlan.getPlantSpeciesCode())); subNode.setPlantSpeciesCode(subPlan.getPlantSpeciesCode()); subNode.setPlantSpeciesName(speciesNameMap.get(subPlan.getPlantSpeciesCode())); + subNode.setPlanId(subPlan.getId()); subNode.setPlanNumber(subPlan.getPlanNumber()); subNode.setPlanStatus(subPlan.getPlanStatus()); subNode.setPlanStatusName(PLAN_MAP.getOrDefault(subPlan.getPlanStatus(),""));