From e197f275ae5aee599b2894c5fe45c0c2b55821c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 22 Nov 2024 15:59:05 +0800 Subject: [PATCH] 'commit' --- src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java | 2 +- src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java | 2 +- src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java | 2 +- src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java | 4 ++-- src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java | 2 +- src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) 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 6d487ba2..3e5e894e 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 @@ -123,7 +123,7 @@ public class A1 { //D预测总招生数 int v = Integer.parseInt(dataList.getFirst().get(DsKit.transLetter2Num("D")).split("\\.")[0]); Row outRow = outSheet.createRow(++rowIndex); - DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "2022年基数", "", String.valueOf(v), "", areaName, cityName), dataStyle); + DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "2022年基数(人)", "", String.valueOf(v), "", areaName, cityName), dataStyle); } //城区 diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java index f4281af9..c692104a 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java @@ -134,7 +134,7 @@ public class A2 { v = Integer.parseInt(dataList.getFirst().get(DsKit.transLetter2Num("G")).split("\\.")[0]); } Row outRow = outSheet.createRow(++rowIndex); - DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "2022年基数", "", String.valueOf(v), "", areaName, cityName), dataStyle); + DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "2022年基数(人)", "", String.valueOf(v), "", areaName, cityName), dataStyle); } //城区 diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java index 0c9b25d0..f18642ae 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java @@ -136,7 +136,7 @@ public class A3 { v = Integer.parseInt(dataList.getFirst().get(DsKit.transLetter2Num("D")).split("\\.")[0]); } Row outRow = outSheet.createRow(++rowIndex); - DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "2022年基数", stageName, "", String.valueOf(v), areaName, cityName), dataStyle); + DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "2022年基数(人)", stageName, "", String.valueOf(v), areaName, cityName), dataStyle); } //城区 diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java index aca9d1bb..1a86a766 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java @@ -122,7 +122,7 @@ public class A4 { v = Integer.parseInt(stringList.get(DsKit.transLetter2Num("G")).split("\\.")[0]); } Row outRow = outSheet.createRow(++rowIndex); - DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "总在校生", stageName, "", String.valueOf(v), areaName, cityName), dataStyle); + DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "总在校生数", stageName, "", String.valueOf(v), areaName, cityName), dataStyle); } //2022入园基数 @@ -137,7 +137,7 @@ public class A4 { v = Integer.parseInt(dataList.getFirst().get(DsKit.transLetter2Num("G")).split("\\.")[0]); } Row outRow = outSheet.createRow(++rowIndex); - DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "2022年基数", stageName, "", String.valueOf(v), areaName, cityName), dataStyle); + DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "2022年基数(人)", stageName, "", String.valueOf(v), areaName, cityName), dataStyle); } //城区 diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java index 846db01d..2e1a3cb7 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java @@ -125,7 +125,7 @@ public class A5 { //D预测总招生数 int v = Integer.parseInt(dataList.getFirst().get(DsKit.transLetter2Num("D")).split("\\.")[0]); Row outRow = outSheet.createRow(++rowIndex); - DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "2022年基数", "", String.valueOf(v), "", areaName, cityName), dataStyle); + DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "2022年基数(人)", "", String.valueOf(v), "", areaName, cityName), dataStyle); } //城区 diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java index 4dc74d6c..13b3872d 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java @@ -135,7 +135,7 @@ public class A6 { v = Integer.parseInt(dataList.getFirst().get(DsKit.transLetter2Num("G")).split("\\.")[0]); } Row outRow = outSheet.createRow(++rowIndex); - DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "2022年基数", "", String.valueOf(v), "", areaName, cityName), dataStyle); + DsKit.putData(outRow, Arrays.asList(String.valueOf(year), "2022年基数(人)", "", String.valueOf(v), "", areaName, cityName), dataStyle); } //城区