'commit'

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

@@ -88,7 +88,7 @@ public class A9 {
                 System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~");
                 int chartNumber = 2;
                 List<List<String>> source1 =
-                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber , 0);
+                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber, 0);
 
 
                 //需要处理下人与万人的单位兼容
@@ -105,20 +105,24 @@ public class A9 {
                         if (StrKit.isBlank(q1)) {
                             q1 = "0";
                         }
-                        String v1 = String.format("%.2f", Double.parseDouble(q1) * mul / 10000);
+
+                        double x = Double.parseDouble(q1) * mul;
+                        String v1 = String.format("%.2f", (x > 1000 ? x / 10000 : x));
 
                         String q2 = row.get(2);
                         if (StrKit.isBlank(q2)) {
                             q2 = "0";
                         }
-                        String v2 = String.format("%.2f", Double.parseDouble(q2) * mul / 10000);
+                        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);
                     }
                 }
 
                 chartNumber = 3;
                 List<List<String>> source2 =
-                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber , 0);
+                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber, 0);
                 if (source2 != null) {
                     //本例中要乘以多少呢？
                     String xmlPath = ExcelKit.DocxUnzipDirectory + "word\\charts\\chart" + chartNumber + ".xml";