From bfd2b2ada7481dbed7ab8df8067f87dffaa263f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Sat, 23 Nov 2024 09:32:38 +0800
Subject: [PATCH] 'commit'

---
 ...云南省】教育特征-决策建议.xlsx | Bin 14359 -> 14359 bytes
 .../dsideal/base/Tools/FillData/Area/A13.java |  27 +++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Doc/待处理/区/【13】教育特征决策建议/【云南省】教育特征-决策建议.xlsx b/Doc/待处理/区/【13】教育特征决策建议/【云南省】教育特征-决策建议.xlsx
index f0271892791aaee45b064b4163cfe37dc5db3512..63a5f73b88bdf920ea4a54c3dd1ba0fd72feb243 100644
GIT binary patch
delta 147
zcmbPUFui~$z?+#xgn@&DgMrs)BTp406R*$a4n`ReJ$V_^c@Vdp*$FJXo8=NKh~Lk3
z3(U{v5d+iBywYHL0iT{aNZSQddk`gPW)7mf%xpkZhnX#iI&S6wqBzYhL6nQRHHd07
KcLPx;&HVt5k0p8l

delta 147
zcmbPUFui~$z?+#xgn@&DgJGK2MxH80rfFWAI~Zj^^yFns=Rw?ZW+$-lZk9`|AbvmB
zEigZuM+{6i^Gbv11$=tyAZ-^+?Lm~FnK_8^GP40u9cH#5>bRK$h~hN21W_*L)*!0U
L+zmvXH1`7l5<D*W

diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A13.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A13.java
index 1ecb3a4d..26260fdd 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A13.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A13.java
@@ -105,6 +105,13 @@ public class A13 {
         return list;
     }
 
+    public static String rs(String s) {
+        //如果s中以 形如 （一） （二）或者 (三) (四)这样的内容替换为空，其它的内容保留下来
+        String regex = "(\\（[一二三四五六七八九十]+\\）)|(\\([一二三四五六七八九十]+\\))";
+        return s.replaceAll(regex, "");
+
+    }
+
     public static void main(String[] args) throws IOException, DocumentException {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
@@ -164,11 +171,17 @@ public class A13 {
                     }
                     Row outRow = outSheet.createRow(++rowIndex);
                     DsKit.putData(outRow, Arrays.asList(areaName, "教育特征", "全县人口呈平稳增长趋势",
-                            list4.getFirst(), list4.get(1), list4.get(2), list4.get(3),
-                            list4.get(4), list4.get(5), list4.get(6),
+                            rs(list4.getFirst()),
+                            rs(list4.get(1)),
+                            rs(list4.get(2)),
+                            rs(list4.get(3)),
+                            rs(list4.get(4)),
+                            rs(list4.get(5)),
+                            rs(list4.get(6)),
                             cityName), dataStyle);
 
                     List<String> list5 = get(5);
+
                     //如果list5的元素个数不足8个，需要补全到8个，空的用空字符串
                     if (list5.size() < 8) {
                         for (int i = list5.size(); i < 8; i++) {
@@ -177,8 +190,14 @@ public class A13 {
                     }
                     outRow = outSheet.createRow(++rowIndex);
                     DsKit.putData(outRow, Arrays.asList(areaName, "决策建议",
-                            list5.getFirst(), list5.get(1), list5.get(2), list5.get(3),
-                            list5.get(4), list5.get(5), list5.get(6), list5.get(7),
+                            rs(list5.getFirst()),
+                            rs(list5.get(1)),
+                            rs(list5.get(2)),
+                            rs(list5.get(3)),
+                            rs(list5.get(4)),
+                            rs(list5.get(5)),
+                            rs(list5.get(6)),
+                            rs(list5.get(7)),
                             cityName), dataStyle);
 
                 }