diff --git a/Doc/待处理/市/【1】学前教育入园总量变化及预测/学前教育入园总量变化及预测【成果】.xlsx b/Doc/待处理/市/【1】学前教育入园总量变化及预测/学前教育入园总量变化及预测【成果】.xlsx new file mode 100644 index 00000000..b287eae9 Binary files /dev/null and b/Doc/待处理/市/【1】学前教育入园总量变化及预测/学前教育入园总量变化及预测【成果】.xlsx differ diff --git a/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java b/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java index 124f406d..522125ab 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java @@ -35,7 +35,7 @@ public class DsKit { */ public static String ConvertXlsToXlsx(String sourceExcel) throws IOException { if (sourceExcel.endsWith(".xls")) { - ExcelCoreUtil.xlsChangeXlsx(sourceExcel, sourceExcel + "x"); + ExcelUtil.xlsChangeXlsx(sourceExcel, sourceExcel + "x"); //删除旧的文件 DsKit.delExcel(sourceExcel); sourceExcel = sourceExcel + "x"; diff --git a/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/ExcelCoreUtil.java b/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/ExcelUtil.java similarity index 96% rename from src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/ExcelCoreUtil.java rename to src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/ExcelUtil.java index 6c9952bd..3dd3f36e 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/ExcelCoreUtil.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/ExcelUtil.java @@ -11,7 +11,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -public class ExcelCoreUtil { +public class ExcelUtil { /** * 将xls的转换为xlsx,数据样式和格式一同转换,并输出为文件流 * @@ -33,7 +33,7 @@ public class ExcelCoreUtil { // 复制sheet,合并栏和冻结窗格之类 Sheet sheet1 = copySheet(wb, swb, i); // 写入xls模板 - ExcelCoreUtil builder = new ExcelCoreUtil(wb); + ExcelUtil builder = new ExcelUtil(wb); int rowNum = sheet.getLastRowNum(); // 复制单元格值与样式 builder.copyRows(swb, sheet, sheet1, 0, rowNum + 1, 0); @@ -49,11 +49,11 @@ public class ExcelCoreUtil { } - private Workbook template = null; + private Workbook template; private final Map fonts = new HashMap<>(); private final Map styles = new HashMap<>(); - public ExcelCoreUtil(Workbook template) { + public ExcelUtil(Workbook template) { this.template = template; }