Browse Source

250528-1代码。

baoyubo 1 month ago
parent
commit
e13a079856
1 changed files with 6 additions and 5 deletions
  1. 6 5
      routers/api/dataManagement/__init__.py

+ 6 - 5
routers/api/dataManagement/__init__.py

@@ -226,8 +226,9 @@ async def generate_import_template(table_id: int, db: Session = Depends(get_db))
     # 创建 DataFrame column_name
     data = {}
     for col in columns :
-        data[col["column_comment"]]=col['column_name']
-    column_names = [col["column_comment"] 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']
     df = pd.DataFrame(data=[data],columns=column_names)
 
     # 将 DataFrame 转换为 Excel 文件
@@ -274,8 +275,8 @@ async def import_data(table_id: int,
         # raise HTTPException(status_code=400, detail="Invalid Excel file")
 
         # 获取字段名和字段备注名
-    column_names = [col["column_name"] for col in columns]
-    column_comments = [col["column_comment"] for col in columns]
+    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']
 
     # 检查第一行是否为字段备注名
     first_row = [cell.value for cell in sheet[1]]
@@ -301,7 +302,7 @@ async def import_data(table_id: int,
         for row in sheet.iter_rows(min_row=3, values_only=True):
             db.execute(insert_query, dict(zip(column_names, row)))
         db.commit()
-        return {"message": "Data imported successfully"}
+        return {"code":200,"msg": "Data imported successfully"}
     except Exception as e:
         db.rollback()
         traceback.print_exc()