|
|
@ -115,11 +115,9 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat |
|
|
|
//组织 关联item项的
|
|
|
|
if (hasExistColumnSet.size() > NumConstant.ZERO) { |
|
|
|
Set<String> configItemIdSet = list.stream().map(IcExportTemplateForExportResultDTO::getItemId).collect(Collectors.toSet()); |
|
|
|
System.out.println("参数的ItemId:" + hasExistColumnSet); |
|
|
|
System.out.println("需要显示的itemId:" + configItemIdSet); |
|
|
|
|
|
|
|
Set<String> conditionItemIdSet = new HashSet<>(hasExistColumnSet); |
|
|
|
conditionItemIdSet.removeAll(configItemIdSet); |
|
|
|
System.out.println("额外需要查询的列:" + conditionItemIdSet); |
|
|
|
conditionItemIdSet.forEach(itemId -> { |
|
|
|
ConditionResultDTO item = icFormItemDao.getConditionItem(itemId); |
|
|
|
if (item == null || StringUtils.isBlank(item.getColumnName())) { |
|
|
@ -143,7 +141,6 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat |
|
|
|
showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getTableName(), root.getColumnName())); |
|
|
|
if (StringUtils.isNotBlank(root.getOptionSourceValue())) { |
|
|
|
String[] paramArr = root.getOptionSourceValue().split(StrConstant.QUESTION_MARK_TRANSFER)[NumConstant.ONE].split(StrConstant.AND_MARK); |
|
|
|
System.out.println("========" + root.getOptionSourceValue()); |
|
|
|
//先remote中再添加 然后移除item中有的
|
|
|
|
hasExistColumnSet.addAll(Arrays.asList(paramArr)); |
|
|
|
} |
|
|
|