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

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!339
This commit is contained in:
王夏晖
2021-12-30 09:07:06 +08:00
parent d64c22a4f8 8f95ccce5b
commit 02b62fdaa1
8 changed files with 101 additions and 62 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查询分解单的文本类型")
@GetMapping("getFileType")
public ResponseMessage<Map<String,String>> getFileType(String standId){
Map<String, String> fileType = ServiceImpl.getFileType(standId);
public ResponseMessage<List<Map<String, String>>> getFileType(String standId){
List<Map<String, String>> fileType = ServiceImpl.getFileType(standId);
return Result.success(fileType);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+6 -3
View File
@@ -246,13 +246,16 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
return sarStandItems;
}
public Map<String,String> getFileType(String standId){
public List<Map<String, String>> getFileType(String standId){
List<String> fileType = dao.getFileType(standId);
Map<String, String> typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream()
.collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName));
Map<String, String> collect = fileType.stream()
.collect(Collectors.toMap(a -> a, b -> typeNameMap.get(b)));
List<Map<String, String>> collect = fileType.stream()
.map(item -> new HashMap<String, String>(){ { put("label", typeNameMap.get(item));put("value", item);} }
).collect(Collectors.toList());
return collect;
}
}