From 3c217e663995b1fd27f22076ec6f4d3d0e8201d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Tue, 26 Aug 2025 22:14:58 +0800 Subject: [PATCH] =?UTF-8?q?feat=20(farm):=20=E6=A8=A1=E5=9E=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加投入品-名称字段 --- .../modelmanagement/ModelManagementServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 a25e4148..ee2e6a35 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 @@ -255,6 +255,13 @@ public class ModelManagementServiceImpl implements ModelManagementService { List commonDisasterDataList = disasterDataService.getDisasterDataList(reqVO); Map commonDisasterDataMap = commonDisasterDataList.stream().collect(Collectors.toMap(DisasterDataDO::getName, e -> e, (v1, v2) -> v1)); + List unit1List= sysDictService.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4_1); // 吨 + Map unit1Map = unit1List.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1)); + + List unit2List= sysDictService.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4_2); // 包 + Map unit2Map = unit2List.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1)); + + ModelManagementDO modelManagementDO = modelManagementMapper.selectById(id); if (modelManagementDO == null) { return null; @@ -296,6 +303,8 @@ public class ModelManagementServiceImpl implements ModelManagementService { List farmingOperationInputDOS = modelFarmingOperationInputMapper.selectByFarmingId(e.getId()); for (ModelFarmingOperationInputDO aDo : farmingOperationInputDOS) { aDo.setInputsName(dictMap.get(aDo.getInputsId())); + aDo.setUnitName(unit1Map.get(aDo.getUnit())); + aDo.setPackageUnitName(unit2Map.get(aDo.getPackageUnit())); } respVO.setFarmingOperationInputDOS(farmingOperationInputDOS); respVOS.add(respVO);