From c104fe51ed9623e25ad3395bfc137744ae6ff6e0 Mon Sep 17 00:00:00 2001
From: chenwu <chenwu.zhu@qq.com>
Date: Wed, 25 Dec 2024 11:26:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E8=BE=83=E5=87=BD=E6=95=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将列名称重新排序后再比较，解决因为列名称顺序不同导致的结果不同
---
 compareData.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/compareData.py b/compareData.py
index 74e10f9..395931b 100644
--- a/compareData.py
+++ b/compareData.py
@@ -33,12 +33,18 @@ class Comparator:
                 self.log_messages.append(f"\n{message}")
                 continue
 
-            df1 = pd.read_excel(
+            df1_ = pd.read_excel(
                 f"{self.file1}.xlsx", sheet_name=i, engine="openpyxl", skiprows=1
             )
-            df2 = pd.read_excel(
+            
+            df2_ = pd.read_excel(
                 f"{self.file2}.xlsx", sheet_name=i, engine="openpyxl", skiprows=1
             )
+            
+            # 按列名称重新排序后进行比较
+            df1 = df1_.reindex(sorted(df1_.columns), axis=1)
+            df2 = df2_.reindex(sorted(df2_.columns), axis=1)
+
             # 比较两个DataFrame中的数据
             if df1.equals(df2):
                 message = f"第{i}个sheet的数据相同"