Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/form/controller/FormExecuteController.java

@@ -260,7 +260,8 @@ public class FormExecuteController {
         // 设置第每列的列宽度
         for (ImportConfig importConfig : importConfigs) {
             if(importConfig.getWidth() == 0){
-                sheet.autoSizeColumn(importConfig.getSortCode());
+                sheet.setColumnWidth(importConfig.getSortCode(), importConfig.getLabel().length() * 4 * 256);
+//                sheet.autoSizeColumn(importConfig.getSortCode());
             }else {
                 sheet.setColumnWidth(importConfig.getSortCode(), importConfig.getWidth() * 256);
             }
@@ -467,8 +468,12 @@ public class FormExecuteController {
         FormReleaseConfig formReleaseConfig = JSONUtil.toBean(formRelease.getConfigJson(), FormReleaseConfig.class);
         // 配置excel第一行字段名
         List<List<String>> head = new ArrayList<>();
-        List<ColumnConfig> columnConfigs = formReleaseConfig.getListConfig().getColumnConfigs();
-        for (ColumnConfig config : columnConfigs) {
+//        List<ColumnConfig> columnConfigs = formReleaseConfig.getListConfig().getColumnConfigs();
+        List<ImportConfig> importConfigs = formReleaseConfig.getListConfig().getImportConfigs();
+//        for (ColumnConfig config : columnConfigs) {
+//            head.add(Collections.singletonList(config.getLabel()));
+//        }
+        for (ImportConfig config : importConfigs) {
             head.add(Collections.singletonList(config.getLabel()));
         }
         List<Map<Integer, Object>> dataList = EasyExcel.read(file.getInputStream()).head(head).sheet().doReadSync();
@@ -476,9 +481,13 @@ public class FormExecuteController {
         List<Map<String, Object>> savedDataList = new ArrayList<>(dataList.size());
         for (Map<Integer, Object> data : dataList) {
             Map<String, Object> saveData = new HashMap<>(data.size());
-            for (int i = 0; i < columnConfigs.size(); i++) {
-                ColumnConfig columnConfig = columnConfigs.get(i);
-                saveData.put(columnConfig.getColumnName(), data.get(i));
+//            for (int i = 0; i < columnConfigs.size(); i++) {
+//                ColumnConfig columnConfig = columnConfigs.get(i);
+//                saveData.put(columnConfig.getColumnName(), data.get(i));
+//            }
+            for (int i = 0; i < importConfigs.size(); i++) {
+                ImportConfig importConfig = importConfigs.get(i);
+                saveData.put(importConfig.getFieldName(), data.get(i));
             }
             savedDataList.add(saveData);
         }