diff --git a/Doc/待处理/区/【7】终-人口总体情况/终-人口总体情况(万人).xlsx b/Doc/待处理/区/【7】终-人口总体情况/终-人口总体情况(万人).xlsx index 77bd4613..21b0e04d 100644 Binary files a/Doc/待处理/区/【7】终-人口总体情况/终-人口总体情况(万人).xlsx and b/Doc/待处理/区/【7】终-人口总体情况/终-人口总体情况(万人).xlsx differ diff --git a/Doc/待处理/区/【7】终-人口总体情况/终-人口总体情况(万人)【成果】.xlsx b/Doc/待处理/区/【7】终-人口总体情况/终-人口总体情况(万人)【成果】.xlsx index 05a52bdf..233b093d 100644 Binary files a/Doc/待处理/区/【7】终-人口总体情况/终-人口总体情况(万人)【成果】.xlsx and b/Doc/待处理/区/【7】终-人口总体情况/终-人口总体情况(万人)【成果】.xlsx differ diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java index 95c7b36f..4fcf617f 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java @@ -105,31 +105,26 @@ public class A7 { //取出第一行 if (dataList.isEmpty()) continue; - //入园总数 - for (List stringList : dataList) { - //年份 - int year = Integer.parseInt(stringList.getFirst()); - //总人口 - String zrk = stringList.get(ExcelKit.transLetter2Num("B")).split("\\.")[0]; - //城镇人口 - String cz = stringList.get(ExcelKit.transLetter2Num("C")).split("\\.")[0]; - //乡村人口 - String xc = stringList.get(ExcelKit.transLetter2Num("D")).split("\\.")[0]; - - Row outRow = outSheet.createRow(++rowIndex); - ExcelKit.putData(outRow, Arrays.asList(areaName, "总人口", zrk, "人", cityName), dataStyle); - - ExcelKit.putData(outRow, Arrays.asList(areaName, "新生人口", "0", "人", cityName), dataStyle); - - ExcelKit.putData(outRow, Arrays.asList(areaName, "城镇人口", cz, "人", cityName), dataStyle); - - ExcelKit.putData(outRow, Arrays.asList(areaName, "乡村人口", xc, "人", cityName), dataStyle); - - //保留两位小数 - ExcelKit.putData(outRow, Arrays.asList(areaName, "城镇化率", - String.format("%.2f", Double.parseDouble(cz) / Double.parseDouble(zrk) * 100) + "%", "人", cityName), dataStyle); - } - + List stringList = dataList.get(1); + //总人口 + String zrk = stringList.get(ExcelKit.transLetter2Num("B")).split("\\.")[0]; + //城镇人口 + String cz = stringList.get(ExcelKit.transLetter2Num("C")).split("\\.")[0]; + //乡村人口 + String xc = stringList.get(ExcelKit.transLetter2Num("D")).split("\\.")[0]; + + Row outRow = outSheet.createRow(++rowIndex); + ExcelKit.putData(outRow, Arrays.asList(areaName, "总人口", zrk, "人", cityName), dataStyle); + outRow = outSheet.createRow(++rowIndex); + ExcelKit.putData(outRow, Arrays.asList(areaName, "新生人口", "0", "人", cityName), dataStyle); + outRow = outSheet.createRow(++rowIndex); + ExcelKit.putData(outRow, Arrays.asList(areaName, "城镇人口", cz, "人", cityName), dataStyle); + outRow = outSheet.createRow(++rowIndex); + ExcelKit.putData(outRow, Arrays.asList(areaName, "乡村人口", xc, "人", cityName), dataStyle); + outRow = outSheet.createRow(++rowIndex); + //保留两位小数 + ExcelKit.putData(outRow, Arrays.asList(areaName, "城镇化率", + String.format("%.2f", Double.parseDouble(cz) / Double.parseDouble(zrk) * 100) + "%", "", cityName), dataStyle); } } //保存文件