From 5036a2b80f96445a5e776967e9ff9b6b785d5c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= <norton618@163.com>
Date: Thu, 16 Oct 2025 19:12:03 +0800
Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E9=A6=96=E9=A1=B5-=E6=88=B7?=
 =?UTF-8?q?=E4=B8=BB=E4=BF=A1=E6=81=AF=E9=9B=86=E5=90=88,=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92-=E5=BC=80=E5=A7=8B=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-
---
 .../cropfarmingcenter/CropFarmingCenterController.java     | 3 +--
 .../cropFarmingCenter/CropFarmingCenterServiceImpl.java    | 2 +-
 .../yudao/module/farm/service/home/HomeServiceImpl.java    | 7 ++++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java
index 9aa27a28..ff405016 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java
@@ -158,8 +158,6 @@ public class CropFarmingCenterController {
     @PutMapping("/production-plan/restart")
     public CommonResult<Boolean> restartPlanning(@RequestBody ProductionPlanUpdateReqVO updateReqVO) {
         updateReqVO.setPlanStatus(CommonConstants.PLAN_STATUS_2);
-        // TODO: 2025/8/29 这里存在业务逻辑问题 ,等产品确认
-        // 如果地块, 物种 模型 被删除 ,则不可以重启
         cropFarmingCenterService.restartProductionPlan(updateReqVO);
         return success(true);
     }
@@ -183,6 +181,7 @@ public class CropFarmingCenterController {
     @Operation(summary = "生产计划-结束按钮")
     @PutMapping("/production-plan/finish")
     public CommonResult<Boolean> finishPlanning(@RequestBody ProductionPlanUpdateReqVO updateReqVO) {
+        updateReqVO.setPlanStatus(CommonConstants.PLAN_STATUS_2);
         cropFarmingCenterService.updateProductionPlan(updateReqVO);
         return success(true);
     }
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 06853a40..199bc22e 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
@@ -255,7 +255,7 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService {
         }
 
         ProductionPlanDO planDO = BeanUtils.toBean(updateReqVO, ProductionPlanDO.class);
-        planDO.setPlanStatus(CommonConstants.PLAN_STATUS_3);
+//        planDO.setPlanStatus(CommonConstants.PLAN_STATUS_3);
         planDO.setPracticalYields(one.getPredictedYields());
         productionPlanMapper.updateById(planDO);
     }
diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java
index 95e06182..aa037eaf 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java
@@ -76,6 +76,7 @@ public class HomeServiceImpl implements HomeService {
         // 员工集合 <id,name>
         Map<String, String> employeeNameMap = personnelManagementService.getEmployeeNameMap();
 
+        // 基地概要信息
         BaseOverviewInfo baseOverviewInfo = null;
         if (StringUtils.isEmpty(baseId)) {
             baseOverviewInfo = this.getCompanyInfo();
@@ -83,12 +84,16 @@ public class HomeServiceImpl implements HomeService {
             BaseInfoDO baseObj = baseInfoService.getBaseInfo(baseId);
             baseOverviewInfo = this.getBaseOverviewInfo(baseObj, employeeNameMap);
         }
+
+        // 统计信息
         StatisticalInfo statisticalInfo = this.getStatisticalInfo(baseId);
 
+        // 基地集合
         List<HomeInfo.BaseInfo> baseList = new ArrayList<>();
         for (BaseInfoDO baseInfoDO : baseInfoService.getBaseInfosById(baseId)) {
             baseList.add(this.getBaseInfo(baseInfoDO,employeeNameMap));
         }
+
         return new HomeInfo(baseOverviewInfo, statisticalInfo,baseList);
     }
 
@@ -155,7 +160,7 @@ public class HomeServiceImpl implements HomeService {
             // 地块浮框信息
             List<PlotPopupFrame> plotPopupFrame = this.getPlotPopupFrame(e.getId(), employeeNameMap);
             // 户主流转信息
-            List<PlotLesseeDetailsRespVO> lesseeList = plotInfoService.getPlotLesseeList(e.getPlotId());
+            List<PlotLesseeDetailsRespVO> lesseeList = plotInfoService.getPlotLesseeList(e.getId());
 
             PlotInfo t = new PlotInfo();
             t.setBaseId(e.getBaseId());