feat (farm): 模型管理
- 添加投入品-名称字段
This commit is contained in:
@@ -255,6 +255,13 @@ public class ModelManagementServiceImpl implements ModelManagementService {
|
||||
List<DisasterDataDO> commonDisasterDataList = disasterDataService.getDisasterDataList(reqVO);
|
||||
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);
|
||||
if (modelManagementDO == null) {
|
||||
return null;
|
||||
@@ -296,6 +303,8 @@ public class ModelManagementServiceImpl implements ModelManagementService {
|
||||
List<ModelFarmingOperationInputDO> 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);
|
||||
|
||||
Reference in New Issue
Block a user