'commit'

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

@@ -86,9 +86,9 @@ public class C9 {
 
                         double value = Double.parseDouble(r.get(1));
                         if (year <= 2023) {
-                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(cityName, "云南省", r.getFirst(), String.format("%.2f", value), "")), dataStyle);
+                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(cityName, "云南省", r.getFirst().substring(0, 4), String.format("%.2f", value), "")), dataStyle);
                         } else {
-                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(cityName, "云南省", r.getFirst(), "", String.format("%.2f", value))), dataStyle);
+                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(cityName, "云南省", r.getFirst().substring(0, 4), "", String.format("%.2f", value))), dataStyle);
                         }
                     }
                 }

src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java

@@ -468,9 +468,10 @@ public class ExcelKit {
         //如果达到目标预期的数量，就直接返回poi获取的数据列表
         int totalRow = data.size() + skipRowCount;
         if (totalRow < expectLimit) {
-            System.out.println("期望数量>=" + expectLimit + ",现在只有" + totalRow + "条，理解为POI读取WORD图表存在问题，使用python进行二次获取数据...");
+            System.out.println("期望数量>=" + expectLimit + ",现在只有" + totalRow + "条，理解为POI读取WORD图表存在问题，使用Python进行二次获取数据...");
+            System.out.println("==========================================================================================================");
             // 留出足够的com关闭word的时间长度，否则会有异常
-            Thread.sleep(4000);
+            Thread.sleep(3000);
             //否则调用python+com进行再次获取数据列表，这次获取的可能才是对的
             //写入交互文本文件
             ExcelKit.callPythonPrepare(docPath, chartNumber);