From 530c2821dd9f36d277092f4e66fab9d302905fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 27 Nov 2024 10:48:09 +0800
Subject: [PATCH] 'commit'

---
 .../教育规模发展情况与预测.xlsx    | Bin 8078 -> 8078 bytes
 .../dsideal/base/Tools/FillData/Area/A15.java |  14 +++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Doc/待处理/区/【15】发展规模预测/教育规模发展情况与预测.xlsx b/Doc/待处理/区/【15】发展规模预测/教育规模发展情况与预测.xlsx
index eba5cd75c3091380900fe8c86b5c769c6c95bb20..1d98f24c11b2037613aea3243ab5e018c30ec4b2 100644
GIT binary patch
delta 177
zcmeCP@3ZF#@MdNaVc_84U|<g0$TNwNi8*ZZ0!A$`eTFFwOq;Oef$1fz5Izrk0GJ=g
z@r47VK148t6-X~$CB_8eu91LfzajY=#Giar#vVkm$(n;Gds!P0RV!-?qV~vw<^IY#
bfaT;YK~$9-Sa7$THHh~^&J9F4$ol~Rz|Aa#

delta 177
zcmeCP@3ZF#@MdNaVc_84U@&sp$TNwN$;fH*0!A$`eTFFwOq;Oef$1fz5Izrk0GJ=g
z@r47VK148t6-X~$CB_8eu91LfzajY=#Giar#vVkm$(n;Gds!P0RV!-?qV~vw<^IY#
bfaT;YK~$9-Sa7$THHh~^&J9F4$ol~Rfb%Za

diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A15.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A15.java
index 32780005..23ae3c84 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A15.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A15.java
@@ -184,11 +184,15 @@ public class A15 {
                 //县区名称
                 System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~");
                 //获取教育发展现状态
-                List<String> list = getDocxJYFZXZ(file.getAbsolutePath());
-                Row outRow = outSheet.createRow(++rowIndex);
-                DsKit.putData(outRow, Arrays.asList(cityName, areaName, "入园入校", list.get(0), list.get(1), list.get(2), list.get(3)), dataStyle);
-                outRow = outSheet.createRow(++rowIndex);
-                DsKit.putData(outRow, Arrays.asList(cityName, areaName, "在园在校", list.get(4), list.get(5), list.get(6), list.get(7)), dataStyle);
+                try {
+                    List<String> list = getDocxJYFZXZ(file.getAbsolutePath());
+                    Row outRow = outSheet.createRow(++rowIndex);
+                    DsKit.putData(outRow, Arrays.asList(cityName, areaName, "入园入校", list.get(0), list.get(1), list.get(2), list.get(3)), dataStyle);
+                    outRow = outSheet.createRow(++rowIndex);
+                    DsKit.putData(outRow, Arrays.asList(cityName, areaName, "在园在校", list.get(4), list.get(5), list.get(6), list.get(7)), dataStyle);
+                } catch (Exception err) {
+                    System.out.println(cityName + " " + areaName + "在整理数据时失败，请人工检查！");
+                }
             }
         }
         //保存文件