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 7fb2d1ca..7b6d7c1b 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 @@ -198,7 +198,7 @@ public class HomeServiceImpl implements HomeService { List plans = productionPlanService.getProductionPlans(baseId,plotId); for (ProductionPlanDO e : plans) { String beingCropName = productionPlanService.getPlantSpeciesCodeForName(e.getPlantSpeciesCode()); - String cycleName = modelManagementService.getModelCycleName(e.getSpeciesModelId()); // TODO: 2025/9/1 + String cycleName = modelManagementService.getModelCycleName(e.getSpeciesModelId()); String beingPlotArea = productionPlanService.getBeingPlotArea(e.getPlotId(), null); PlanInfo target = new PlanInfo(); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java index 2b40abb5..b6d09f27 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java @@ -76,11 +76,11 @@ public interface ModelManagementService { Map getCount(); /** - * 生命周期-名称 - * @param planId => task_id + * 模型周期-名称 + * @param modelId => task_id * @return */ - String getModelCycleName(String planId); + String getModelCycleName(String modelId); /** * 获取当前计划下所有农事操作 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java index d77ef043..60d46c9b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java @@ -451,8 +451,9 @@ public class ModelManagementServiceImpl implements ModelManagementService { } @Override - public String getModelCycleName(String planId) { - return null; + public String getModelCycleName(String modelId) { + ModelCycleDO one = modelCycleMapper.selectOne("model_id", modelId); + return one.getName(); } @Override