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 c7269ff5..03feeb7b 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 @@ -91,7 +91,7 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { for (ProductionPlanSaveReqVO.CultivationArea e : cultivationAreaList) { ProductionPlanDO obj = new ProductionPlanDO(); obj.setPlantSpeciesCode(reqVO.getPlantSpeciesCode()); - obj.setSpeciesModelId(speciesModelId); + obj.setProductionStartDate(reqVO.getProductionStartDate()); obj.setProductionEndDate(reqVO.getProductionEndDate()); obj.setHarvestStartDate(reqVO.getHarvestStartDate()); @@ -122,7 +122,7 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { if (speciesModelId.equals("")) { return; } - + obj.setSpeciesModelId(speciesModelId); list.add(obj); } productionPlanMapper.insertBatch(list); @@ -217,7 +217,7 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { throw exception(PRODUCTION_PLAN_NOT_EXISTS); } - ModelManagementRespVO modelManagementRespVO = modelManagementService.getModelManagement(productionPlanDO.getSpeciesModelId()); + ModelManagementRespVO modelManagementRespVO = modelManagementService.getModelManagement(productionPlanDO.getId()); ProductionPlanRespVO productionPlanRespVO = BeanUtils.toBean(productionPlanDO, ProductionPlanRespVO.class); productionPlanRespVO.setModelManagementRespVO(modelManagementRespVO); 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 edd9514d..591b232b 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 @@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.DisasterDataReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictThreeLvRespVO; import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleRespVO; import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO; import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementPageReqVO; @@ -233,8 +232,8 @@ public class ModelManagementServiceImpl implements ModelManagementService { } @Override - public ModelManagementDO getModelManagement(String field,String id) { - return modelManagementMapper.selectOne(field,id); + public ModelManagementDO getModelManagement(String field, String id) { + return modelManagementMapper.selectOne(field, id); } @Override @@ -279,9 +278,9 @@ public class ModelManagementServiceImpl implements ModelManagementService { Map unit2Map = unit2List.stream().collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1)); - ModelManagementDO modelManagementDO = modelManagementMapper.selectOne(ModelManagementDO::getTaskId,id); + ModelManagementDO modelManagementDO = modelManagementMapper.selectById(id); if (modelManagementDO == null) { - return null; + modelManagementDO = modelManagementMapper.selectOne(ModelManagementDO::getTaskId, id); } // 使用统一的转换方法 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java index db550083..bd57d717 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java @@ -256,17 +256,6 @@ public class SpeciesLibraryServiceImpl implements SpeciesLibraryService { .filter(Objects::nonNull) .collect(Collectors.toList()); - Map> categoryToSpeciesMap; - if (level2Ids.isEmpty()) { - categoryToSpeciesMap = java.util.Collections.emptyMap(); - } else { - level2Ids.forEach(level2Id -> { - - }); - - - } - List result = new ArrayList<>(); for (TwoDictTreeRespVO lvl1 : level1Nodes) { SpeciesThreeLevelTreeRespVO lvl1Vo = new SpeciesThreeLevelTreeRespVO();