Commit 2283a66d by fudahua

Merge branch 'feature-2023-04' into 'developer'

Feature 2023 04

See merge request !69
parents a0ea02d8 bea1509a
......@@ -936,11 +936,13 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
boolean first=true;
do {
if (titles == null) {
titles=new ArrayList<>();
List<String> cellsList = Arrays.asList(cells);
List<FlatQueryField> fields = flatQueryFieldDao.getFlatQueryFieldByTableId(tableId);
Map<String, ColumnInfo> columnInfoMap = fields.stream().filter(mid -> cellsList.contains(mid.getFieldName())).collect(Collectors.toMap(mid -> mid.getFieldName(),
mid -> new ColumnInfo(mid.getFieldType(), mid.getFieldMark())));
for (String cell : cells) {
logger.info("cell:{}",cell);
titles.add(columnInfoMap.get(cell));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment