'commit'

8 months ago · bebe90c5aa
parent e53714be2c
commit bebe90c5aa
3 changed files with 2 additions and 2 deletions
--- a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx
+++ b/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx
--- a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双【成果】.xlsx
+++ b/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双【成果】.xlsx
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
@ -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);
                    }
                }
            }