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 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 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 { // 员工集合 Map 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 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 = this.getPlotPopupFrame(e.getId(), employeeNameMap); // 户主流转信息 - List lesseeList = plotInfoService.getPlotLesseeList(e.getPlotId()); + List lesseeList = plotInfoService.getPlotLesseeList(e.getId()); PlotInfo t = new PlotInfo(); t.setBaseId(e.getBaseId());