diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java index 0f9cd832..7bec3e74 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; +import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; @@ -72,5 +73,5 @@ public class ModelCycleRespVO { private List pestDiseaseWeedDOS; - private List farmingOperationDOS; + private List farmingOperationDOS; } 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 cc0673b1..435a9758 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,6 +5,7 @@ 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.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; import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO; import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementSaveReqVO; @@ -54,7 +55,8 @@ public class ModelManagementServiceImpl implements ModelManagementService { private ModelPestDiseaseWeedMapper modelPestDiseaseWeedMapper; @Resource private ModelFarmingOperationMapper modelFarmingOperationMapper; - + @Resource + private ModelFarmingOperationInputMapper modelFarmingOperationInputMapper; @Override public String createModelManagement(ModelManagementSaveReqVO createReqVO) { @@ -118,7 +120,14 @@ public class ModelManagementServiceImpl implements ModelManagementService { vo.setPestDiseaseWeedDOS(pestDiseaseWeedDO); //ε†œδΊ‹ζ“δ½œ List farmingOperationDO = modelFarmingOperationMapper.selectByCycleId(cycle.getId()); - vo.setFarmingOperationDOS(farmingOperationDO); + List respVOS = new ArrayList<>(); + farmingOperationDO.forEach(e->{ + ModelFarmingOperationRespVO respVO = BeanUtils.toBean(e, ModelFarmingOperationRespVO.class); + List farmingOperationInputDOS = modelFarmingOperationInputMapper.selectByFarmingId(e.getId()); + respVO.setFarmingOperationInputDOS(farmingOperationInputDOS); + respVOS.add(respVO); + }); + vo.setFarmingOperationDOS(respVOS); vos.add(vo); }); bean.setModelCycles(vos);