From 553972bf36ad129308e23af4e3bd7ac1eb68b4c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com>
Date: Sun, 31 Aug 2025 18:52:09 +0800
Subject: [PATCH] =?UTF-8?q?farm=E6=A8=A1=E5=9D=97-=E5=9C=B0=E5=9D=97?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=9F=BA=E5=9C=B0=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../farm/dal/dataobject/plotinfo/PlotInfoDO.java   |  2 ++
 .../farm/service/plotinfo/PlotInfoServiceImpl.java | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/plotinfo/PlotInfoDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/plotinfo/PlotInfoDO.java
index 723d3515..4f5f3615 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/plotinfo/PlotInfoDO.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/plotinfo/PlotInfoDO.java
@@ -32,6 +32,8 @@ public class PlotInfoDO extends BaseDO {
      * 所属基地ID
      */
     private String baseId;
+    @TableField(exist = false)
+    private String baseName;
     /**
      * 地块ID
      */
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 e7f700a4..ac24794f 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
@@ -85,7 +85,7 @@ public class PlotInfoServiceImpl implements PlotInfoService {
             throw exception(PLOT_INFO_NOT_EXISTS);
         }
         // 校验: 存在在种地块时 不允许删除
-        boolean flag = productionPlanService.validateIncompletePlansBId("plot_id",obj.getPlotId());
+        boolean flag = productionPlanService.validateIncompletePlansBId("plot_id", obj.getPlotId());
         // 删除
         if (flag) {
             plotInfoMapper.deleteById(id);
@@ -106,12 +106,15 @@ public class PlotInfoServiceImpl implements PlotInfoService {
 
     @Override
     public PlotInfoDO getPlotInfo(String id) {
-        return plotInfoMapper.selectById(id);
+        PlotInfoDO plotInfoDO = plotInfoMapper.selectById(id);
+        BaseInfoDO baseInfoDO = baseInfoMapper.selectById(plotInfoDO.getBaseId());
+        plotInfoDO.setBaseName(baseInfoDO.getName());
+        return plotInfoDO;
     }
 
     @Override
     public List<PlotInfoDO> getPlotInfos(String baseId) {
-        return plotInfoMapper.selectList("base_id",baseId);
+        return plotInfoMapper.selectList("base_id", baseId);
     }
 
     @Override
@@ -138,9 +141,10 @@ public class PlotInfoServiceImpl implements PlotInfoService {
 
     /**
      * 验证: 地块总面积不得大于基地面积
+     *
      * @param baseId 基地面积
      */
-    private boolean validateTotalPlotArea(String baseId){
+    private boolean validateTotalPlotArea(String baseId) {
         BaseInfoDO baseObj = baseInfoMapper.selectOne("id", baseId);
         BigDecimal baseArea = baseObj.getArea();
 
@@ -154,7 +158,7 @@ public class PlotInfoServiceImpl implements PlotInfoService {
                 .filter(area -> area != null) // 重要：过滤null值
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
 
-        return plotTotalArea.compareTo(baseArea) > 0 ;
+        return plotTotalArea.compareTo(baseArea) > 0;
     }
 
 }
\ No newline at end of file