diff --git a/Doc/待处理/区/【7】终-人口总体情况/终-人口总体情况(万人)【成果】.xlsx b/Doc/待处理/区/【7】终-人口总体情况/终-人口总体情况(万人)【成果】.xlsx index 8468bc7c..5e407f4f 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 edec045b..27e41d91 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 @@ -40,9 +40,6 @@ public class A7 { public static void main(String[] args) throws IOException, InvalidFormatException { //初始化数据库连接 LocalMysqlConnectUtil.Init(); - //实例化 - - //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet @@ -113,13 +110,13 @@ public class A7 { String xc = stringList.get(DsKit.transLetter2Num("D")).split("\\.")[0]; Row outRow = outSheet.createRow(++rowIndex); - DsKit.putData(outRow, Arrays.asList(areaName, "总人口", zrk, "人", cityName), dataStyle); + DsKit.putData(outRow, Arrays.asList(areaName, "总人口", String.format("%.2f", 1.0 * Integer.parseInt(zrk) / 10000), "万人", cityName), dataStyle); outRow = outSheet.createRow(++rowIndex); - DsKit.putData(outRow, Arrays.asList(areaName, "新生人口", "0", "人", cityName), dataStyle); + DsKit.putData(outRow, Arrays.asList(areaName, "新生人口", "0", "万人", cityName), dataStyle); outRow = outSheet.createRow(++rowIndex); - DsKit.putData(outRow, Arrays.asList(areaName, "城镇人口", cz, "人", cityName), dataStyle); + DsKit.putData(outRow, Arrays.asList(areaName, "城镇人口", String.format("%.2f", 1.0 * Integer.parseInt(cz) / 10000), "万人", cityName), dataStyle); outRow = outSheet.createRow(++rowIndex); - DsKit.putData(outRow, Arrays.asList(areaName, "乡村人口", xc, "人", cityName), dataStyle); + DsKit.putData(outRow, Arrays.asList(areaName, "乡村人口", String.format("%.2f", 1.0 * Integer.parseInt(xc) / 10000), "万人", cityName), dataStyle); outRow = outSheet.createRow(++rowIndex); //保留两位小数 DsKit.putData(outRow, Arrays.asList(areaName, "城镇化率",