diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java index 734d4608..7d2be0c7 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java @@ -99,7 +99,7 @@ public class C2 { //年份,总量分类,区域分类,总量数值,区域数值,行政区划,上级行政区划 double xvalue = Double.parseDouble(source2.getFirst().get(4)); String value = String.format("%.2f", xvalue); - ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst().split("\\.")[0], "2022年基数", "", value, + ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst().split("\\.")[0], "2022年基数(万人)", "", value, "", cityName, "云南省")), dataStyle); } diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java index a6f9909f..ff9afe17 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java @@ -115,7 +115,7 @@ public class C3 { Row outRow = outSheet.createRow(++rowIndex); // 导出数据 //年份,总量分类,区域分类,总量数值,区域数值,行政区划,上级行政区划 - ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), "", "2022年基数", stageName, "", source2.getFirst().get(4), + ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), "", "2022年基数(万人)", stageName, "", source2.getFirst().get(4), cityName, "云南省")), dataStyle); } diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java index 2bf36c90..b9a02133 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java @@ -119,7 +119,7 @@ public class C4 { Row outRow = outSheet.createRow(++rowIndex); // 导出数据 //年份,总量分类,区域分类,总量数值,区域数值,行政区划,上级行政区划 - ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), "", "2022年基数", stageName, "", source2.getFirst().get(4), + ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), "", "2022年基数(万人)", stageName, "", source2.getFirst().get(4), cityName, "云南省")), dataStyle); } diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java index 7c539830..b71751f9 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java @@ -93,7 +93,7 @@ public class C5 { Row outRow = outSheet.createRow(++rowIndex); // 导出数据 //年份,总量分类,区域分类,总量数值,区域数值,行政区划,上级行政区划 - ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), "2022年基数", "", source2.getFirst().get(4), + ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), "2022年基数(万人)", "", source2.getFirst().get(4), "", cityName, "云南省")), dataStyle); } diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java index 58d17e32..adc5ec95 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java @@ -93,7 +93,7 @@ public class C6 { Row outRow = outSheet.createRow(++rowIndex); // 导出数据 //年份,总量分类,区域分类,总量数值,区域数值,行政区划,上级行政区划 - ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), "2022年基数", "", source2.getFirst().get(4), + ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), "2022年基数(万人)", "", source2.getFirst().get(4), "", cityName, "云南省")), dataStyle); }