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

feat (farm): 模型管理

Browse Source 
- 添加投入品-名称字段
This commit is contained in:
达富斌
2025-08-26 22:14:58 +08:00
parent ef2e53c82d
commit 3c217e6639
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,6 +255,13 @@ public class ModelManagementServiceImpl implements ModelManagementService {
List<DisasterDataDO> commonDisasterDataList = disasterDataService.getDisasterDataList(reqVO); List<DisasterDataDO> commonDisasterDataList = disasterDataService.getDisasterDataList(reqVO);
Map<String, DisasterDataDO> commonDisasterDataMap = commonDisasterDataList.stream().collect(Collectors.toMap(DisasterDataDO::getName, e -> e, (v1, v2) -> v1)); Map<String, DisasterDataDO> commonDisasterDataMap = commonDisasterDataList.stream().collect(Collectors.toMap(DisasterDataDO::getName, e -> e, (v1, v2) -> v1));
List<SysDictDO> unit1List= sysDictService.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4_1); // 吨
Map<String, String> unit1Map = unit1List.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1));
List<SysDictDO> unit2List= sysDictService.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4_2); // 包
Map<String, String> unit2Map = unit2List.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1));
ModelManagementDO modelManagementDO = modelManagementMapper.selectById(id); ModelManagementDO modelManagementDO = modelManagementMapper.selectById(id);
if (modelManagementDO == null) { if (modelManagementDO == null) {
return null; return null;
@@ -296,6 +303,8 @@ public class ModelManagementServiceImpl implements ModelManagementService {
List<ModelFarmingOperationInputDO> farmingOperationInputDOS = modelFarmingOperationInputMapper.selectByFarmingId(e.getId()); List<ModelFarmingOperationInputDO> farmingOperationInputDOS = modelFarmingOperationInputMapper.selectByFarmingId(e.getId());
for (ModelFarmingOperationInputDO aDo : farmingOperationInputDOS) { for (ModelFarmingOperationInputDO aDo : farmingOperationInputDOS) {
aDo.setInputsName(dictMap.get(aDo.getInputsId())); aDo.setInputsName(dictMap.get(aDo.getInputsId()));
aDo.setUnitName(unit1Map.get(aDo.getUnit()));
aDo.setPackageUnitName(unit2Map.get(aDo.getPackageUnit()));
} }
respVO.setFarmingOperationInputDOS(farmingOperationInputDOS); respVO.setFarmingOperationInputDOS(farmingOperationInputDOS);
respVOS.add(respVO); respVOS.add(respVO);