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

征求意见查询文本类型接口 完善 补充海外的字段（原逻辑只有国内字段）

Browse Source
This commit is contained in:
yuezhihang
2022-04-14 14:56:03 +08:00
parent d466d96b91
commit aab8023f1a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+7 -2
View File
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -286,7 +287,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
public List<Map<String, String>> getFileType(String standId){
List<String> fileType = dao.getFileType(standId);
Map<String, String> typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream()
List<SarStandAttrDetails> res=new ArrayList<>();
res= (List<SarStandAttrDetails>) CollectionUtils.union(InitStandAttrUtil.standInlandAttrFieldList, InitStandAttrUtil.standForeignAttrFieldList);
Map<String, String> typeNameMap = res.stream()
.collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName));
List<Map<String, String>> collect = fileType.stream()
@@ -299,7 +302,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
public List<Map<String, String>> getFileTypeHG(String standId){
List<String> fileType = dao.getFileTypeHG(standId);
Map<String, String> typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream()
List<SarStandAttrDetails> res=new ArrayList<>();
res= (List<SarStandAttrDetails>) CollectionUtils.union(InitStandAttrUtil.standInlandAttrFieldList, InitStandAttrUtil.standForeignAttrFieldList);
Map<String, String> typeNameMap = res.stream()
.collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName));
List<Map<String, String>> collect = fileType.stream()