比较函数逻辑修改
将列名称重新排序后再比较,解决因为列名称顺序不同导致的结果不同
This commit is contained in:
parent
254848eed4
commit
c104fe51ed
@ -33,12 +33,18 @@ class Comparator:
|
|||||||
self.log_messages.append(f"\n{message}")
|
self.log_messages.append(f"\n{message}")
|
||||||
continue
|
continue
|
||||||
|
|
||||||
df1 = pd.read_excel(
|
df1_ = pd.read_excel(
|
||||||
f"{self.file1}.xlsx", sheet_name=i, engine="openpyxl", skiprows=1
|
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
|
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中的数据
|
# 比较两个DataFrame中的数据
|
||||||
if df1.equals(df2):
|
if df1.equals(df2):
|
||||||
message = f"第{i}个sheet的数据相同"
|
message = f"第{i}个sheet的数据相同"
|
||||||
|
Loading…
Reference in New Issue
Block a user