From a9e144b2d64e778254ff2521f7df810aad7f2122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 20 Nov 2024 10:57:09 +0800 Subject: [PATCH] 'commit' --- .../学前幼儿入园总量预测.xlsx | Bin 11171 -> 11171 bytes .../dsideal/base/Tools/Util/ReadDocxUtil.java | 15 ++++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx b/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx index 059ed90f8795d26b46e2140bdb246406047e21be..bfe3378412b9051b3aa0671c24d3d441811fd4cf 100644 GIT binary patch delta 155 zcmZ1+zBrsaz?+#xgn@&DgW<YoH76XTCf(qL^mGHZAke@woq;Q%D1G%bK+u%<1LoTzCBBrj-!#09k+ aLE>6gK(bE@BywKM21xQ~y93D(ZGQmAkvW$D delta 155 zcmZ1+zBrsaz?+#xgn@&DgQ0ID_hd%KzRmL)wL#QrrW6omz>)_RWK9E6Z0yrP)I5%V zTtI5BZ~`lk`X|B2#Mrk<8mvu6W(^Nx-{hMb4nR^$(*j5aYuWS{LBImVifFzH$JCF>~_6Gn(JurI! diff --git a/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java b/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java index 8b75fbc1..5febd8fa 100644 --- a/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java +++ b/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java @@ -70,20 +70,17 @@ public class ReadDocxUtil { * @return */ public String getAreaName(String fileName) { - List listAreaRecord = dm.getProvinceArea(privinceName); - List listCity = new ArrayList<>(); - for (Record record : listAreaRecord) { - listCity.add(record.getStr("area_name")); + List list = dm.getProvinceArea(privinceName); + List listArea = new ArrayList<>(); + for (Record record : list) { + listArea.add(record.getStr("area_name")); } - //城市名称的前两位一样就视为一样 - String result = fileName.replaceAll("^[^\u4e00-\u9fa5]++", "");//去掉开头非中文符号 - String top2 = result.substring(0, 2); //判断是哪个城市 boolean found = false; String areaName = ""; - for (String s : listCity) { - if (s.startsWith(top2)) { + for (String s : listArea) { + if (fileName.contains(s.substring(0, 2))) { found = true; areaName = s; }