boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

farm模块-子集

Browse Source
This commit is contained in:
顾君禹
2025-08-21 10:44:45 +08:00
parent e5b9edea50
commit 3676f7fc4e
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java
View File

@@ -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<ModelPestDiseaseWeedDO> pestDiseaseWeedDOS;
private List<ModelFarmingOperationDO> farmingOperationDOS;
private List<ModelFarmingOperationRespVO> farmingOperationDOS;
}

13
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java
View File

@@ -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<ModelFarmingOperationDO> farmingOperationDO = modelFarmingOperationMapper.selectByCycleId(cycle.getId());
vo.setFarmingOperationDOS(farmingOperationDO);
List<ModelFarmingOperationRespVO> respVOS = new ArrayList<>();
farmingOperationDO.forEach(e->{
ModelFarmingOperationRespVO respVO = BeanUtils.toBean(e, ModelFarmingOperationRespVO.class);
List<ModelFarmingOperationInputDO> farmingOperationInputDOS = modelFarmingOperationInputMapper.selectByFarmingId(e.getId());
respVO.setFarmingOperationInputDOS(farmingOperationInputDOS);
respVOS.add(respVO);
});
vo.setFarmingOperationDOS(respVOS);
vos.add(vo);
});
bean.setModelCycles(vos);