|
|
|
@ -110,7 +110,7 @@ public class A9 {
|
|
|
|
|
}
|
|
|
|
|
x = Double.parseDouble(q2) * mul;
|
|
|
|
|
String v2 = String.format("%.2f", (x > 1000 ? x / 10000 : x));
|
|
|
|
|
DsKit.putData(outRow, Arrays.asList(cityName, areaName, year, v1, "", v2, ""), dataStyle);
|
|
|
|
|
DsKit.putData(outRow, Arrays.asList(cityName, areaName, year.replace("年份","").replace("年",""), v1, "", v2, ""), dataStyle);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -138,7 +138,7 @@ public class A9 {
|
|
|
|
|
}
|
|
|
|
|
double x = Double.parseDouble(q2) * mul;
|
|
|
|
|
String v2 = String.format("%.2f", (x > 1000 ? x / 10000 : x));
|
|
|
|
|
DsKit.putData(outRow, Arrays.asList(cityName, areaName, year, "", v1, "", v2), dataStyle);
|
|
|
|
|
DsKit.putData(outRow, Arrays.asList(cityName, areaName, year.replace("年份","").replace("年",""), "", v1, "", v2), dataStyle);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|