diff --git a/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx b/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx index 3699a90a..d1d195ea 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 43cef05f..95c52625 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 @@ -164,17 +164,23 @@ public class A1 { // 修正乡村招生C 修正县城外招生-修正县城外招生*30% for (List stringList : dataList) { - //年份 - int year = Integer.parseInt(stringList.getFirst()); - //G:6修正乡村招生G - int v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("G")).split("\\.")[0]); - if (colsCount == 9) { - v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("F")).split("\\.")[0]); - int d = (int) (v * 0.3);//乘以0.3 - v = v - d;//剩下70% + try { + //年份 + int year = Integer.parseInt(stringList.getFirst()); + //G:6修正乡村招生G + String q = stringList.get(ExcelKit.transLetter2Num("G")); + if (StrKit.isBlank(q)) q = "0"; + int v = Integer.parseInt(q.split("\\.")[0]); + if (colsCount == 9) { + v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("F")).split("\\.")[0]); + int d = (int) (v * 0.3);//乘以0.3 + v = v - d;//剩下70% + } + Row outRow = outSheet.createRow(++rowIndex); + ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "乡村", "", String.valueOf(v), areaName, cityName), dataStyle); + } catch (Exception err) { + } - Row outRow = outSheet.createRow(++rowIndex); - ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "乡村", "", String.valueOf(v), areaName, cityName), dataStyle); } } }