Merge branch 'main' of http://10.10.14.176:3000/huanghai/YunNanDsBase

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

@@ -87,8 +87,9 @@ public class A8 {
                 //县区名称
                 System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~");
                 int chartNumber = 1;
+
                 List<List<String>> source =
-                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber, 0);//从2017年开始
+                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber, 0);
 
                 //需要处理下人与万人的单位兼容
                 int mul = 1;
@@ -97,6 +98,7 @@ public class A8 {
                     String xmlPath = ExcelKit.DocxUnzipDirectory + "word\\charts\\chart" + chartNumber + ".xml";
                     mul = ExcelKit.getMul(xmlPath);
 
+
                     for (List<String> row : source) {
                         String year = row.getFirst().split("\\.")[0];
                         Row outRow = outSheet.createRow(++rowIndex);
@@ -104,7 +106,8 @@ public class A8 {
                         if (StrKit.isBlank(q)) {
                             q = "0";
                         }
-                        String v = String.format("%.2f", Double.parseDouble(q) * mul/10000);
+                        double x = Double.parseDouble(q) * mul;
+                        String v = String.format("%.2f", (x > 1000 ? x / 10000 : x));//如果数值大于1000，则计算以万为单位，否则就保留原来的数字
                         if (Integer.parseInt(year) <= 2023) {
                             ExcelKit.putData(outRow, Arrays.asList(cityName, areaName, year, v, ""), dataStyle);
                         } else {

src/main/java/com/dsideal/base/Tools/Test/TestOutSideExcel.java

@@ -12,14 +12,13 @@ import java.util.List;
 
 public class TestOutSideExcel {
 
-    ///c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:tx/c:rich/a:p/a:r/a:t/text()
     public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException, ParserConfigurationException, SAXException, XPathExpressionException, DocumentException {
-        String sourceDoc = "c:/双江县人口变化及其对教育的影响的研究报告.docx";
+        String sourceDoc = "c:/《威信县）人口变化及其对教育的影响》2.docx";
         //需要第几个图表
-        for (int chartNumber = 36; chartNumber <= 36; chartNumber++) {
+        for (int chartNumber = 1; chartNumber <= 1; chartNumber++) {
             System.out.println("正在处理第" + chartNumber + "个图表的信息~");
             //读取图表
-            List<List<String>> list = ExcelKit.getChartData(sourceDoc, chartNumber,0);
+            List<List<String>> list = ExcelKit.getChartData(sourceDoc, chartNumber, 0);
             ExcelKit.printTable(list);
         }
     }