返回更多属性

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java

@@ -21,7 +21,7 @@ public class IcExportItemListFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @NotEmpty(message = "请至少添加一个导出项")
-    private List<IcExportItemListFormDTO> subItemList;
+    private List<IcExportItemListFormDTO> children;
 
     /**
      * 父id

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java

@@ -129,9 +129,6 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
     }
 
     private void digui(Map<String, List<IcExportTemplateForExportResultDTO>> resultTemp, IcExportTemplateForExportResultDTO root, List<List<String>> headerList, List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, List<IcCustomExportResultDTO.SqlColumn> hiddenSqlColumns, Set<String> hasExistColumnSet) {
-
-
-
         if (StringUtils.isNotBlank(root.getColumnName())) {
             showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getTableName(), root.getColumnName()));
             if (StringUtils.isNotBlank(root.getOptionSourceValue())) {

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml

@@ -20,7 +20,13 @@
     </resultMap>
     <select id="getTemplateConfigForExport" resultType="com.epmet.dto.result.IcExportTemplateForExportResultDTO">
         SELECT
-            c.ID,c.TEMP_ID,c.LABEL,c.PID,c.sort,ifi.ID AS itemId,ifig.TABLE_NAME,concat(ifi.COLUMN_NAME,if(ifi.COLUMN_NUM = 0,'',ifi.COLUMN_NUM)) columnName,
+            c.ID,c.TEMP_ID,
+            c.LABEL,
+            c.PID,
+            c.sort,
+            ifi.ID AS itemId,
+            ifig.TABLE_NAME,
+            concat(ifi.COLUMN_NAME,if(ifi.COLUMN_NUM = 0,'',ifi.COLUMN_NUM)) columnName,
             ifi2.OPTION_SOURCE_VALUE
         FROM ic_export_template_config c
         LEFT JOIN ic_form_item ifi ON c.FORM_ITEM_ID = ifi.ID

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -258,9 +258,16 @@
             ifi.CUSTOMER_ID,
             ifi.ITEM_GROUP_ID,
             ifi.LABEL,
-            ifi.SORT
+            ifi.SORT,
-        FROM  ic_form_item ifi WHERE ITEM_GROUP_ID = #{groupId} and ifi.CUSTOMER_ID = #{customerId}
+            ifi.OPTION_SOURCE_VALUE,
-        AND LENGTH(ifi.COLUMN_NAME)>0
+            ifig.TABLE_NAME,
+            CONCAT(ifi.COLUMN_NAME, if(ifi.COLUMN_NUM = 0, '', ifi.COLUMN_NUM)) columnName
+        FROM
+            ic_form_item ifi
+            LEFT JOIN ic_form_item_group ifig ON ifi.ITEM_GROUP_ID = ifig.ID
+        WHERE
+            ITEM_GROUP_ID = #{groupId} and ifi.CUSTOMER_ID = #{customerId}
+            AND LENGTH(ifi.COLUMN_NAME)>0
     </select>
 
 </mapper>