From 54b2738ea1f220596971da1c7e9f0f333a02a83a Mon Sep 17 00:00:00 2001
From: zy123 <646228430@qq.com>
Date: Wed, 30 Oct 2024 09:23:59 +0800
Subject: [PATCH] =?UTF-8?q?10.29=E6=88=AA=E5=8F=96=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E6=A0=87=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flask_app/general/纯技术参数要求提取.py | 11 +----------
 flask_app/main/资格评审.py              |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/flask_app/general/纯技术参数要求提取.py b/flask_app/general/纯技术参数要求提取.py
index 312527c..d6d54d0 100644
--- a/flask_app/general/纯技术参数要求提取.py
+++ b/flask_app/general/纯技术参数要求提取.py
@@ -34,12 +34,9 @@ def extract_matching_keys(data_dict, good_list):
 
 def get_technical_requirements_main(file_path,output_folder):
     truncate_file=truncate_pdf_main(file_path,output_folder,5)[0]
-<<<<<<< Updated upstream
     truncate_file_docx=pdf2docx(truncate_file)
     file_id=upload_file(truncate_file_docx)
-=======
-    file_id=upload_file(truncate_file)
->>>>>>> Stashed changes
+    # file_id=upload_file(truncate_file)
     final_res=get_technical_requirements(file_id)
     # 安全地提取 "技术要求" 内部的字典内容
     if isinstance(final_res, dict) and '技术要求' in final_res and isinstance(final_res['技术要求'], dict):
@@ -49,13 +46,7 @@ def get_technical_requirements_main(file_path,output_folder):
     else:
         return final_res
 if __name__ == "__main__":
-<<<<<<< Updated upstream
     file_path="C:\\Users\\Administrator\\Desktop\\fsdownload\\45f650ce-e519-457b-9ad6-5840e2ede539\\ztbfile.pdf"
     output_folder = "C:\\Users\\Administrator\\Desktop\\fsdownload\\45f650ce-e519-457b-9ad6-5840e2ede539\\tmp"
     res=get_technical_requirements_main(file_path,output_folder)
     print(res)
-=======
-    file_path="C:\\Users\\Administrator\\Desktop\\fsdownload\\217754b7-3efd-41b2-806b-0b5b1bc98904\\ztbfile.pdf"
-    output_folder = "C:\\Users\\Administrator\\Desktop\\货物标\\output1\\tmp"
-    # res=get_technical_requirements_main(truncate_file,output_folder)
->>>>>>> Stashed changes
diff --git a/flask_app/main/资格评审.py b/flask_app/main/资格评审.py
index 5b06c55..4e3f03c 100644
--- a/flask_app/main/资格评审.py
+++ b/flask_app/main/资格评审.py
@@ -190,7 +190,7 @@ def process_qualification(qualification_review, qualification, invalid_path, mer
     else:  # 大多数情况
         print("资格评审： type5")
         user_querys = generate_qual_question(matching_keys_list)  # 生成提问->‘附件：资格审查’
-        file_id2 = upload_file(truncate3)
+        file_id2 = upload_file(qualification)
         results2 = multi_threading(user_querys, "", file_id2, 2)  # 资格评审表，调用qianwen-long
         res_list = []
         if not results2: