From 0245b04807e2ca56ebc4450b546c3d721b84105c Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 29 Dec 2021 17:58:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A0=87=E5=87=86id=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=88=86=E8=A7=A3=E5=8D=95=E7=9A=84=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarStandItemsController.java        |  4 ++--
 .../service/impl/SarStandItemsServiceImpl.java     | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

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<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);
     }
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<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));
+        List<Map<String, String>> collect = InitStandAttrUtil.standInlandAttrFieldList.stream()
+                .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;
     }
 }