'commit'

src/main/java/com/dsideal/base/Tools/FillData/City/C9.java

@@ -55,12 +55,12 @@ public class C9 {
             for (File file : files) {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
-                //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
                 if (fileName.endsWith(".docx") && !fileName.startsWith("~")) {
+                    //城市名称
+                    String cityName = ru.getCityOrAreaName(file.getName());
                     if (StrKit.isBlank(cityName)) {
                         System.out.println("文件名无法解析为城市：" + fileName);
                         System.exit(0);
@@ -82,13 +82,13 @@ public class C9 {
 
                         double value = Double.parseDouble(r.get(1));
                         if (year < 2023) {
-                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList( "云南省",cityName, r.getFirst().substring(0, 4), String.format("%.2f", value), "")), dataStyle);
+                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省", cityName, r.getFirst().substring(0, 4), String.format("%.2f", value), "")), dataStyle);
                         }
                         if (year > 2023) {
-                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省",cityName, r.getFirst().substring(0, 4), "", String.format("%.2f", value))), dataStyle);
+                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省", cityName, r.getFirst().substring(0, 4), "", String.format("%.2f", value))), dataStyle);
                         }
                         if (year == 2023) {
-                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省",cityName, r.getFirst().substring(0, 4), String.format("%.2f", value), String.format("%.2f", value))), dataStyle);
+                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省", cityName, r.getFirst().substring(0, 4), String.format("%.2f", value), String.format("%.2f", value))), dataStyle);
                         }
                     }
                 }

src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java

@@ -53,11 +53,14 @@ public class ReadDocxUtil {
         //合并下listArea,listCity
         listCity.addAll(listArea);
 
+        //城市名称的前两位一样就视为一样
+        String top2= fileName.substring(0,2);
+
         //判断是哪个城市
         boolean found = false;
         String cityName = "";
         for (String s : listCity) {
-            if (fileName.contains(s)) {
+            if (s.startsWith(top2)) {
                 found = true;
                 cityName = s;
             }