diff --git a/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx b/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx index bfe33784..3699a90a 100644 Binary files a/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx and b/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx differ diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java index 0f0ffc37..43cef05f 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java @@ -80,7 +80,7 @@ public class A1 { if (flag) continue; //只关心发展规模数据的表格 if (!file.getName().contains(fileNameKey)) continue; - //县区名称 + //县区名称 String areaName = ru.getAreaName(file.getName()); //市州名称 String cityName = ru.getCityNameByAreaName(areaName); @@ -132,7 +132,16 @@ public class A1 { //年份 int year = Integer.parseInt(stringList.getFirst()); //E:修正城区招生A 修正县城内招生 - int v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("E")).split("\\.")[0]); + String q = "0"; + int v = 0; + if (!StrKit.isBlank(q)) { + try { + q = stringList.get(ExcelKit.transLetter2Num("E")).split("\\.")[0]; + v = Integer.parseInt(q); + } catch (Exception err) { + + } + } Row outRow = outSheet.createRow(++rowIndex); ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "城区", "", String.valueOf(v), areaName, cityName), dataStyle); @@ -143,7 +152,9 @@ public class A1 { //年份 int year = Integer.parseInt(stringList.getFirst()); //F:修正镇区招生B 修正县城内招生 - int v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("F")).split("\\.")[0]); + String q = stringList.get(ExcelKit.transLetter2Num("F")); + if (StrKit.isBlank(q)) q = "0"; + int v = Integer.parseInt(q.split("\\.")[0]); if (colsCount == 9) { v = (int) (v * 0.3);//乘以0.3 } diff --git a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java b/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java index 8ac92f9e..4c890c56 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java @@ -424,7 +424,7 @@ public class ExcelKit { } start += headRows;//第二个表的表头有几行 - System.out.println("表格开始行索引=" + start + ",结束行索引=" + end); + //System.out.println("表格开始行索引=" + start + ",结束行索引=" + end); //输出第二个表格的数据 for (rowIndex = start; rowIndex <= end; rowIndex++) { Row row = sheet.getRow(rowIndex);