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

fix (farm): 模型管理-农事记录-投入品

Browse Source 
- 单位名称字段为null
This commit is contained in:
达富斌
2025-08-26 22:31:50 +08:00
parent 3c217e6639
commit 68c19097c6
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java
View File

@@ -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("单价")

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java
View File

@@ -100,10 +100,10 @@ public class ModelFarmingOperationServiceImpl implements ModelFarmingOperationSe
Map<String, String> dictMap = dictDOList.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField2Code, SysDictDO::getField2Name, (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));
Map<String, String> unit1Map = unit1List.stream().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));
Map<String, String> unit2Map = unit2List.stream().collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1));
ModelFarmingOperationRespVO bean = BeanUtils.toBean(modelFarmingOperationMapper.selectById(id), ModelFarmingOperationRespVO.class);

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

@@ -256,10 +256,10 @@ public class ModelManagementServiceImpl implements ModelManagementService {
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));
Map<String, String> unit1Map = unit1List.stream().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));
Map<String, String> unit2Map = unit2List.stream().collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1));
ModelManagementDO modelManagementDO = modelManagementMapper.selectById(id);

9
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java
View File

@@ -227,10 +227,19 @@ public class SysDictServiceImpl implements SysDictService {
List<SysDictDO> dictDOList= sysDictMapper.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4);
Map<String, String> dictMap = dictDOList.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField2Name, SysDictDO::getField2Code, (v1, v2) -> v1));
List<SysDictDO> unit1List= this.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4_1); // 吨
Map<String, String> unit1Map = unit1List.stream().collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1));
List<SysDictDO> unit2List= this.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4_2); // 包
Map<String, String> unit2Map = unit2List.stream().collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1));
List<InputLibraryDO> inputLibraryDOS = inputLibraryMapper.selectList();
List<InputLibraryRespVO> 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;