FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据标准id查询分解单的文本类型返回结构修改

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-12-29 17:58:16 +08:00
parent 466b2d8458
commit 0245b04807
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java
+2 -2
View File
@@ -123,8 +123,8 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
@ApiOperation(value = "|SarFileSplitInfoEO|根据标准id查询分解单的文本类型") @ApiOperation(value = "|SarFileSplitInfoEO|根据标准id查询分解单的文本类型")
@GetMapping("getFileType") @GetMapping("getFileType")
public ResponseMessage<Map<String,String>> getFileType(String standId){ public ResponseMessage<List<Map<String, String>>> getFileType(String standId){
Map<String, String> fileType = ServiceImpl.getFileType(standId); List<Map<String, String>> fileType = ServiceImpl.getFileType(standId);
return Result.success(fileType); return Result.success(fileType);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+9 -5
View File
@@ -242,13 +242,17 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
return sarStandItems; return sarStandItems;
} }
public Map<String,String> getFileType(String standId){ public List<Map<String, String>> getFileType(String standId){
List<String> fileType = dao.getFileType(standId); List<String> fileType = dao.getFileType(standId);
Map<String, String> typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() List<Map<String, String>> collect = InitStandAttrUtil.standInlandAttrFieldList.stream()
.collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); .map(item -> {
Map<String, String> map = new HashMap<>();
map.put("label", item.getAttrName());
map.put("value", item.getAttrField());
return map;
}).collect(Collectors.toList());
Map<String, String> collect = fileType.stream()
.collect(Collectors.toMap(a -> a, b -> typeNameMap.get(b)));
return collect; return collect;
} }
} }