|
|
@@ -228,7 +228,7 @@ async def generate_import_template(table_id: int, db: Session = Depends(get_db))
|
|
|
for col in columns :
|
|
|
if col['column_name'] !='id':
|
|
|
data[col["column_comment"]]=col['column_name']
|
|
|
- column_names = [col["column_comment"] for col in columns if col["column_comment"]!='id']
|
|
|
+ column_names = [col["column_comment"] for col in columns if col["column_name"]!='id']
|
|
|
df = pd.DataFrame(data=[data],columns=column_names)
|
|
|
|
|
|
# 将 DataFrame 转换为 Excel 文件
|
|
|
@@ -276,7 +276,7 @@ async def import_data(table_id: int,
|
|
|
|
|
|
# 获取字段名和字段备注名
|
|
|
column_names = [col["column_name"] for col in columns if col["column_name"]!='id']
|
|
|
- column_comments = [col["column_comment"] for col in columns if col["column_comment"]!='id']
|
|
|
+ column_comments = [col["column_comment"] for col in columns if col["column_name"]!='id']
|
|
|
|
|
|
# 检查第一行是否为字段备注名
|
|
|
first_row = [cell.value for cell in sheet[1]]
|
