From 913e9b8a4583a7993d13974889e92a7677382d2a Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 27 Apr 2022 14:25:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/dto/form/IcExportItemListFormDTO.java | 6 +++++- .../com/epmet/service/impl/IcResiUserExportServiceImpl.java | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java index aa3a9d43b2..47fd7777b4 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java +++ b/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; /** - * 只有远程获取的才有值 + * item选项 值 */ private String optionSourceValue; + /** + * item选项 值获取方式 + */ + private String optionSourceType; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 873568d2b1..daaa8ac415 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/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); if (singleResult.size() < showSqlColumns.size()) { - - IcCustomExportResultDTO.SqlColumn sqlColumn = itemMap.get(key); String tableName = sqlColumn.getTableName(); String itemId = sqlColumn.getItemId();