From 2b703b93a442928bbd8a4b34a53912c251a16afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 19 Nov 2024 15:48:18 +0800
Subject: [PATCH] 'commit'

---
 ...�变化及其对教育的影响》(4).docx | Bin 0 -> 162 bytes
 .../Tools/FillData/ExcelKit/ExcelKit.java     |  33 +++++++++++-------
 .../base/Tools/Test/TestOutSideExcel.java     |   3 +-
 3 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 Doc/待处理/区/【12】新-教育资源配置发展预测/~$.11鲁甸县）《县（区）人口变化及其对教育的影响》(4).docx

diff --git a/Doc/待处理/区/【12】新-教育资源配置发展预测/~$.11鲁甸县）《县（区）人口变化及其对教育的影响》(4).docx b/Doc/待处理/区/【12】新-教育资源配置发展预测/~$.11鲁甸县）《县（区）人口变化及其对教育的影响》(4).docx
new file mode 100644
index 0000000000000000000000000000000000000000..2c9f82fbc2299675d0c87eac63c136c0d1b2b5cc
GIT binary patch
literal 162
zcmd;eOv%m6%PcM_N-W7QVjvRmGB`4%Fyu01GUNeqF+&MM5kn%7%m>mSP}ABkEdZp;
v^@PBD7{LT(z{JIOO*-pub(?W=_vGytG8q`YtE!ZR0r?D!4PcdKQ@FGMC6*cA

literal 0
HcmV?d00001

diff --git a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java b/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java
index f1d55a2f..80969d3c 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java
@@ -369,7 +369,7 @@ public class ExcelKit {
     }
 
     public static List<List<String>> getChartData(String docPath, int chartNumber, int skipRowCount) throws IOException, InvalidFormatException, DocumentException, InterruptedException {
-          return getChartDataByXml(docPath, chartNumber, skipRowCount);
+        return getChartDataByXml(docPath, chartNumber, skipRowCount);
 
 //        InputStream is = new FileInputStream(docPath);
 //        ZipSecureFile.setMinInflateRatio(-1.0d);
@@ -500,6 +500,7 @@ public class ExcelKit {
             }
             System.out.println();
         }
+        System.out.println("====================================================");
     }
 
 
@@ -617,12 +618,28 @@ public class ExcelKit {
                         if (e == null) {
                             row.add(null);
                         } else {
-                            row.add(e.element("v").getText());
+                            //如果x可以转为小数，那么需要保留两位小数，如果可以转换为整数，那么直接返回整数，如果是字符串，就不变
+                            String x = null;
+                            try {
+                                x = e.element("v").getText();
+                                double d = Double.parseDouble(x);
+                                if (d == (int) d) {
+                                    x = String.valueOf((int) d);
+                                } else {
+                                    x = String.format("%.2f", d);
+                                }
+                            } catch (Exception err) {
+                                //do nothing
+                            }
+                            row.add(x);
                         }
                     }
                     matrix.add(row);
                 }
 
+                printTable(matrix);
+
+
                 //上面生成的数据格式需要行转列,横坐标是年份，纵坐标是数据
                 int rowCount = matrix.size();// 计算行数和列数
                 int colCount = matrix.getFirst().size();
@@ -636,17 +653,7 @@ public class ExcelKit {
                     // 遍历每一行，将当前列的值添加到新的内部列表中
                     for (int row = 0; row < rowCount; row++) {
                         String x = matrix.get(row).get(col);
-                        //如果x可以转为小数，那么需要保留两位小数，如果可以转换为整数，那么直接返回整数，如果是字符串，就不变
-                        try {
-                            double d = Double.parseDouble(x);
-                            if (d == (int) d) {
-                                x = String.valueOf((int) d);
-                            } else {
-                                x = String.format("%.2f", d);
-                            }
-                        } catch (Exception e) {
-                            //do nothing
-                        }
+
                         column.add(x);
                     }
                     // 将当前列添加到结果列表中
diff --git a/src/main/java/com/dsideal/base/Tools/Test/TestOutSideExcel.java b/src/main/java/com/dsideal/base/Tools/Test/TestOutSideExcel.java
index 5e71ac83..452fc312 100644
--- a/src/main/java/com/dsideal/base/Tools/Test/TestOutSideExcel.java
+++ b/src/main/java/com/dsideal/base/Tools/Test/TestOutSideExcel.java
@@ -16,12 +16,11 @@ public class TestOutSideExcel {
     public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException, ParserConfigurationException, SAXException, XPathExpressionException, DocumentException {
         String sourceDoc = "D:\\dsWork\\YunNanDsBase\\Doc\\待处理\\区\\【12】新-教育资源配置发展预测\\（6.11鲁甸县）《县（区）人口变化及其对教育的影响》(4).docx";
         //需要第几个图表
-        for (int chartNumber = 36; chartNumber <= 36; chartNumber++) {
+        for (int chartNumber = 4; chartNumber <= 4; chartNumber++) {
             System.out.println("正在处理第" + chartNumber + "个图表的信息~");
             //读取图表
             List<List<String>> list = ExcelKit.readChart(sourceDoc, chartNumber);
             ExcelKit.printTable(list);
-            System.out.println("=========================================================");
         }
     }
 }