'commit'

src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java

@@ -98,6 +98,11 @@ public class A9 {
                     String xmlPath = ExcelKit.DocxUnzipDirectory + "word\\charts\\chart" + chartNumber + ".xml";
                     mul = ExcelKit.getMul(xmlPath);
 
+                    if (file.getName().contains("个旧")) {
+                        System.out.println("mul=" + mul);
+                        System.out.println("Here");
+                    }
+
                     for (List<String> row : source1) {
                         String year = row.getFirst().split("\\.")[0];
                         Row outRow = outSheet.createRow(++rowIndex);
@@ -115,7 +120,6 @@ public class A9 {
                         }
                         x = Double.parseDouble(q2) * mul;
                         String v2 = String.format("%.2f", (x > 1000 ? x / 10000 : x));
-
                         ExcelKit.putData(outRow, Arrays.asList(cityName, areaName, year, v1, "", v2, ""), dataStyle);
                     }
                 }
@@ -141,7 +145,8 @@ public class A9 {
                         if (StrKit.isBlank(q2)) {
                             q2 = "0";
                         }
-                        String v2 = String.format("%.2f", Double.parseDouble(q2) * mul / 10000);
+                        double x = Double.parseDouble(q2) * mul;
+                        String v2 = String.format("%.2f", (x > 1000 ? x / 10000 : x));
                         ExcelKit.putData(outRow, Arrays.asList(cityName, areaName, year, "", v1, "", v2), dataStyle);
                     }
                 }