From 8190dc2844f92dd526ec2d7571d40b0849999238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 15 Nov 2024 13:57:08 +0800
Subject: [PATCH] 'commit'

---
 .../学前幼儿入园总量预测.xlsx       | Bin 11171 -> 11171 bytes
 ...�幼儿入园总量预测【成果】.xlsx | Bin 264861 -> 264861 bytes
 .../dsideal/base/Tools/FillData/Area/A1.java  |  22 ++++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx b/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx
index 2a6e9f8c683700514c967d4f3da19fe8d9fe9d58..7bfe2002aa8708972152c813984deedf8fed57bc 100644
GIT binary patch
delta 177
zcmZ1+zBrsGz?+#xgn@&DgFz^NBhMs8CZYVz3mCP)^ckjPFm1?^3lV2c1=H;8)4=q6
zj=x+W_49<|S%LK8{}N0fE~7L=yROV?9w2}6Ee(4RC9P==qCzxnK-45nTM%_o6D%jB
c<p7q`vIJ56T42EoTGk*QueKYA3f1-l02pg8WB>pF

delta 177
zcmZ1+zBrsGz?+#xgn@&DgCQ_)BhMs8rog<-3mCP)^ckjPFm1?^3lV2c1=H;8)4=q6
zj=x+W_49<|S%LK8{}N0fE~7L=yROV?9w2}6Ee(4RC9P==qCzxnK-45nTM%_o6D%jB
c<p7q`vIJ56T42EoTGk*QueKYA3f1-l0L`{ExBvhE

diff --git a/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测【成果】.xlsx b/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测【成果】.xlsx
index 1d80fa1ec2ffe391919a98e69e206dd45cc25696..5c6c04e07f9ac873580f634c2a649874a15b0915 100644
GIT binary patch
delta 463
zcmbO`RbcK^0iFPFW)=|!4h{|msr-#RRg6qh`I|c!WkB@gWlZNmR5`P1eXRFk1Ch4>
zUMFg2FWc(ubX)P1Lx4;~VTJgl<menbk41O??aiDkdS$oD`(io2ds)>X%D)(%voFr}
zxy++{;m`@ka?`r3@{_7=b_KdWGfb}hV3Et8?G>Tc)4bPMEJotM;uja^aYjG3V>!+7
zaS{8`S}9K1!{Lub_&>g~O4?cRShjwG&1o|i#|M+x{n8SX!j<i`mqtwecDJ|Nfs095
z<HAAVSwWu;vlX2BZ@oc9yYkCnFW<{k{Ei+v+N)uC=f17pY4zrL|MeKmuSTA2VU}}P
zq>=D2C0X_U$>PG=%kK&%r~h<y%5*wyrX9I6(e-E0#Q4vfKfKO~DHi2^$@o@2FFmhT
zY2AtWvu67Tc(ZfZC2=~kF)}c01Y+dC+q{S6mmw(hc9{JDhvFs+F))3~QW``zKeuXs
zZp8@1OxvGZG3TBIicJsWV6g|$(>YkoLG%R<78?$!{QO9eEz?CfA)>yVEDj*qeohuk
V5Pgc1#TrDjbFsLAXn!siKL85ruVDZH

delta 463
zcmbO`RbcK^0iFPFW)=|!4h{~6$h?g_Rg6rLd7C>JWkB@gWlZNmR5`P1{Y9_C1|n_o
zs!#U$URtNL@U1|qf(G9ji#^;YH|lQl^jLKF-n}j7xL(Ch`fn|-Ucb|}kNFqF^XkRg
zXM(x}GcrTg-{!J6-Tg#JS-vGK$v{f0hN*vhsiyAqV+Zd^a_fD05cnnI{L-}r;!RIm
zDsCRssFC87JskenP4Lmxtw*?iszuc+NG=smX;GNM(RAj}k#%l0VOl%2-tLwbYn;Tw
zCgI5LA93mgzx09LfA<?zBTp`VAD%U9S;;AJy}TnQ9{zh*7-{$N>z{JY9eU@p^kh32
zxLg_e)upw6`px_NdUjg->z=gPEgM@zd37rsEB94uo?QPk@<*xJx_w=(B@N&Bw;OM_
zQ=0z7|Lj-w0B?4VeYg4UvN19+Yy@KDz}vis<(DBS^mds20Eglx3o$T#%2FCcH$S&(
ze{RJH#7x_tTQTRJ1&U1%<6yA|(bG9t%t7=84i+1Z$h`bWkS)_iI3c3GoGcC?*?vwI
WOAvjElf@cDvvaYyfoOj&7C!(aoVY3g

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 2bd1c736..04c3dd2e 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
@@ -30,6 +30,13 @@ public class A1 {
     //有好多EXCEL，啥样的有用？必须带有关键字字样的才有用!
     static String fileNameKey = "发展规模数据";
 
+    //第二个表格的表头信息
+    static String tableKeyword = "自动计算招生数、在校生数";
+    //第二个表格的表头有几行
+    static int tableHeadRows = 2;
+    //第二个表格的最后一列的列名
+    static String tableLetterIndex = "K";
+
     public static void main(String[] args) throws IOException, InvalidFormatException {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
@@ -75,11 +82,6 @@ public class A1 {
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
                 String areaName = ru.getCityOrAreaName(file.getName());
-                if (StrKit.isBlank(areaName)) {
-                    System.out.println("发现异常数据，请人工处理：" + file.getName());
-                    System.exit(0);
-                }
-
                 //市州名称
                 //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
                 String parentPathName = file.getParentFile().getName();
@@ -88,15 +90,16 @@ public class A1 {
                     parentPathName = file.getParentFile().getParentFile().getName();
                     cityName = ru.getCityOrAreaName(parentPathName);
                 }
-                if (StrKit.isBlank(cityName)) {
+                if (StrKit.isBlank(cityName)||StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
                     System.exit(0);
                 }
+
                 //县区名称
                 System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~");
                 String sourceExcel = file.getAbsolutePath();
-                List<List<String>> dataList = ExcelKit.readSecondTable(sourceExcel, 0, "自动计算招生数、在校生数",
-                        2, "K");
+                List<List<String>> dataList = ExcelKit.readSecondTable(sourceExcel, 0, tableKeyword,
+                        tableHeadRows, tableLetterIndex);
 
                 //这个工作表有四个蓝色列：D:预测总招生数，E:修正城区招生A，F:修正镇区招生B，G:修正乡村招生C
                 //有时，有也三个蓝色列：D:预测总招生数，E:修正县城内招生，G:修正县城外招生
@@ -108,12 +111,11 @@ public class A1 {
                 int cnt = 0;
                 for (String s : x) if (s == null) cnt++;
                 int colsCount = x.size() - cnt;
-                //System.out.println("列数=" + colsCount);
 
                 //入园总数
                 for (List<String> stringList : dataList) {
                     //年份
-                    int year = Integer.parseInt(stringList.get(0));
+                    int year = Integer.parseInt(stringList.getFirst());
                     //D预测总招生数
                     String v = stringList.get(ExcelKit.transLetter2Num("D")).split("\\.")[0];
                     Row outRow = outSheet.createRow(++rowIndex);