Merge branch 'develop_3' into 'develop_master'

feat: 标准库

See merge request !35

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -316,6 +316,31 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return resultMap;
     }
 
+    public void attrInfoShowDetails(List<SarStandardsInfo> sarlist) throws Exception {
+        for (SarStandardsInfo row : sarlist) {
+            attrInfoDetails(row);
+            Map<String, Object> getAttrMap = row.getAttrInfoMap();
+            if (getAttrMap != null && getAttrMap.size() > 0) {
+                for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
+                    String name = entry.getKey();
+                    String value = "";
+                    if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) {
+                        value = entry.getValue().toString();
+                        if (StringUtils.isNotBlank(value)) {
+                            List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
+                            entry.setValue(fileObj);
+                        }
+                    }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
+                        value = entry.getValue().toString();
+                        List<String> valArr = Arrays.asList(value.split(","));
+                        value = dicTypeEODao.getDicNamesByCodes(valArr);
+                        entry.setValue(value);
+                    }
+                }
+            }
+        }
+    }
+
     public void attrInfoShow(List<SarStandardsInfo> sarlist) throws Exception {
         for (SarStandardsInfo row : sarlist) {
             attrInfoDetails(row);
@@ -1826,7 +1851,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         if (resultlist.size() > 0) {
             List<SarStandardsInfo> sarStandardsInfoEOList = new ArrayList<>();
             sarStandardsInfoEOList.add(resultlist.get(0));
-            attrInfoShow(sarStandardsInfoEOList);
+            attrInfoShowDetails(sarStandardsInfoEOList);
             sarStandardsInfoEO = sarStandardsInfoEOList.get(0);
         }
         // 查询纳入清单的国家地区