diff --git a/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx b/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx index 059ed90f..bfe33784 100644 Binary files a/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx and b/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx differ 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; }