'commit'

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

@@ -48,6 +48,7 @@ public class C9 {
         //递归获取指定目录下所有文件
         List<File> files = FileUtil.loopFiles(parentPath, file -> true);
         int rowIndex = 0;
+        //-----------------------------------------------------------
 
         //处理这个目录
         if (files != null) {
@@ -80,11 +81,15 @@ public class C9 {
                         int year = Integer.parseInt(r.getFirst().substring(0, 4));
 
                         double value = Double.parseDouble(r.get(1));
-                        if (year <= 2023) {
+                        if (year < 2023) {
                             ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(cityName, "云南省", r.getFirst().substring(0, 4), String.format("%.2f", value), "")), dataStyle);
-                        } else {
+                        }
+                        if (year > 2023) {
                             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);
+                        }
                     }
                 }
             }