diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 053e1756..f43caaab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -123,8 +123,8 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "|SarFileSplitInfoEO|根据标准id查询分解单的文本类型") @GetMapping("getFileType") - public ResponseMessage> getFileType(String standId){ - Map fileType = ServiceImpl.getFileType(standId); + public ResponseMessage>> getFileType(String standId){ + List> fileType = ServiceImpl.getFileType(standId); return Result.success(fileType); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 5f0fadbb..1c08045b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -242,13 +242,17 @@ public class SarStandItemsServiceImpl extends ServiceImpl getFileType(String standId){ + public List> getFileType(String standId){ List fileType = dao.getFileType(standId); - Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() - .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); + List> collect = InitStandAttrUtil.standInlandAttrFieldList.stream() + .map(item -> { + Map map = new HashMap<>(); + map.put("label", item.getAttrName()); + map.put("value", item.getAttrField()); + return map; + }).collect(Collectors.toList()); + - Map collect = fileType.stream() - .collect(Collectors.toMap(a -> a, b -> typeNameMap.get(b))); return collect; } }