Browse Source

添加type

dev
jianjun 3 years ago
parent
commit
913e9b8a45
  1. 6
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java
  2. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java

6
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java

@ -61,9 +61,13 @@ public class IcExportItemListFormDTO implements Serializable {
private String columnName; private String columnName;
/** /**
* 只有远程获取的才有 * item选项
*/ */
private String optionSourceValue; private String optionSourceValue;
/**
* item选项 值获取方式
*/
private String optionSourceType;
} }

2
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java

@ -169,8 +169,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
IcCustomExportResultDTO.SqlColumn columnDTO = itemMap.get(key); IcCustomExportResultDTO.SqlColumn columnDTO = itemMap.get(key);
if (singleResult.size() < showSqlColumns.size()) { if (singleResult.size() < showSqlColumns.size()) {
IcCustomExportResultDTO.SqlColumn sqlColumn = itemMap.get(key); IcCustomExportResultDTO.SqlColumn sqlColumn = itemMap.get(key);
String tableName = sqlColumn.getTableName(); String tableName = sqlColumn.getTableName();
String itemId = sqlColumn.getItemId(); String itemId = sqlColumn.getItemId();

Loading…
Cancel
Save