diff --git a/Doc/待处理/区/【8】总人口变化及预测-双/~$总人口变化及预测-双-(万人)【成果】.xlsx b/Doc/待处理/区/【8】总人口变化及预测-双/~$总人口变化及预测-双-(万人)【成果】.xlsx deleted file mode 100644 index 1e0c8b3a..00000000 Binary files a/Doc/待处理/区/【8】总人口变化及预测-双/~$总人口变化及预测-双-(万人)【成果】.xlsx and /dev/null differ diff --git a/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx new file mode 100644 index 00000000..d1ce9984 Binary files /dev/null and b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx differ diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java index 6fd33d45..cd07e2ff 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java @@ -102,7 +102,7 @@ public class A8 { for (List row : source) { String year = row.getFirst().split("\\.")[0]; - Row outRow = outSheet.createRow(++rowIndex); + String q = row.get(1); if (StrKit.isBlank(q)) { q = "0"; @@ -110,9 +110,11 @@ public class A8 { double x = Double.parseDouble(q) * mul; String v = String.format("%.2f", (x > 1000 ? x / 10000 : x));//如果数值大于1000,则计算以万为单位,否则就保留原来的数字 if (Integer.parseInt(year) <= 2023) { + Row outRow = outSheet.createRow(++rowIndex); ExcelKit.putData(outRow, Arrays.asList(cityName, areaName, year, v, ""), dataStyle); } if (Integer.parseInt(year) >= 2023) { + Row outRow = outSheet.createRow(++rowIndex); ExcelKit.putData(outRow, Arrays.asList(cityName, areaName, year, "", v), dataStyle); } }