From 68c19097c603c3512e5dd20d3c63b2eb6adf0558 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:31:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E6=A8=A1=E5=9E=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=86=9C=E4=BA=8B=E8=AE=B0=E5=BD=95-=E6=8A=95?= =?UTF-8?q?=E5=85=A5=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 单位名称字段为null --- .../admin/inputlibrary/vo/InputLibraryRespVO.java | 4 ++++ .../ModelFarmingOperationServiceImpl.java | 4 ++-- .../modelmanagement/ModelManagementServiceImpl.java | 4 ++-- .../module/farm/service/sysDict/SysDictServiceImpl.java | 9 +++++++++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java index c309ce01..08753426 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java @@ -36,10 +36,14 @@ public class InputLibraryRespVO { @Schema(description = "单位") @ExcelProperty("单位") private String unit; + private String unitName; + @Schema(description = "单件") @ExcelProperty("单件") private String packageUnit; + private String packageUnitName; + @Schema(description = "单价", example = "23806") @ExcelProperty("单价") diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java index ffabf046..63cc08a4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java @@ -100,10 +100,10 @@ public class ModelFarmingOperationServiceImpl implements ModelFarmingOperationSe Map dictMap = dictDOList.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField2Code, SysDictDO::getField2Name, (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)); + Map unit1Map = unit1List.stream().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)); + Map unit2Map = unit2List.stream().collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1)); ModelFarmingOperationRespVO bean = BeanUtils.toBean(modelFarmingOperationMapper.selectById(id), ModelFarmingOperationRespVO.class); 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 ee2e6a35..12543a0f 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 @@ -256,10 +256,10 @@ public class ModelManagementServiceImpl implements ModelManagementService { 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)); + Map unit1Map = unit1List.stream().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)); + Map unit2Map = unit2List.stream().collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1)); ModelManagementDO modelManagementDO = modelManagementMapper.selectById(id); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java index 4f8ff816..75f91d7c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java @@ -227,10 +227,19 @@ public class SysDictServiceImpl implements SysDictService { List dictDOList= sysDictMapper.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4); Map dictMap = dictDOList.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField2Name, SysDictDO::getField2Code, (v1, v2) -> v1)); + List unit1List= this.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4_1); // 吨 + Map unit1Map = unit1List.stream().collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1)); + + List unit2List= this.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4_2); // 包 + Map unit2Map = unit2List.stream().collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1)); + + List inputLibraryDOS = inputLibraryMapper.selectList(); List res = BeanUtils.toBean(inputLibraryDOS, InputLibraryRespVO.class); for (InputLibraryRespVO e : res) { e.setAssetCode(dictMap.get(e.getAssetName())); + e.setUnitName(unit1Map.get(e.getUnit())); + e.setPackageUnitName(unit2Map.get(e.getPackageUnit())); } return res;