From 91062dda27e06bf29eaa78eff47ba505ad19b7a2 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 18 十二月 2024 16:00:31 +0800
Subject: [PATCH] 机构接口优化
---
app/utils/excelmerge/conformity.py | 113 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 63 insertions(+), 50 deletions(-)
diff --git a/app/utils/excelmerge/conformity.py b/app/utils/excelmerge/conformity.py
index 901357c..128657d 100644
--- a/app/utils/excelmerge/conformity.py
+++ b/app/utils/excelmerge/conformity.py
@@ -1,64 +1,77 @@
-import xlwings as xw
+from openpyxl import load_workbook
from datetime import datetime
import os
-import shutil
def run_conformity():
+ try:
+ # 鍔犺浇妯℃澘鏂囦欢
+ template_path = os.path.join('app', 'utils', 'excelmerge', '鍥界綉涓婃捣鐢靛姏鏁村悎妯＄増.xlsx')
+ template_excel = load_workbook(template_path)
+ EXCEL_FILES_PATH = os.path.join('data', 'output')
- source_folder = os.path.join('data', 'source')
- template_path = os.path.join('app', 'utils', 'excelmerge', '鍥界綉涓婃捣鐢靛姏鏁村悎妯＄増.xlsx')
- EXCEL_FILES_PATH = os.path.join('data', 'output')
+ # 鑾峰彇宸ヤ綔琛�
+ sheet1 = template_excel['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
+ sheet2 = template_excel['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
+ sheet3 = template_excel['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
+ sheet4 = template_excel['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
+ sheet5 = template_excel['鍏稿瀷缁忛獙浜ゆ祦']
- app = xw.App(visible=False)
- templateExcel = xw.Book(template_path)
+ # 鑾峰彇婧愭枃浠惰矾寰�
+ source_folder = os.path.join('data', 'source')
+ source_files = [f for f in os.listdir(source_folder) if f.endswith('.xlsx') and not f.startswith('~$')]
- sheet1 = templateExcel.sheets['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
- sheet2 = templateExcel.sheets['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
- sheet3 = templateExcel.sheets['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
- sheet4 = templateExcel.sheets['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
- sheet5 = templateExcel.sheets['鍏稿瀷缁忛獙浜ゆ祦']
+ for file in source_files:
+ source_path = os.path.join(source_folder, file)
+ source_excel = load_workbook(source_path)
- source_files = [f for f in os.listdir(source_folder) if f.endswith('.xlsx') and not f.startswith('~$')]
+ # 鑾峰彇婧愬伐浣滆〃
+ ssheet1 = source_excel['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
+ ssheet2 = source_excel['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
+ ssheet3 = source_excel['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
+ ssheet4 = source_excel['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
+ ssheet5 = source_excel['鍏稿瀷缁忛獙浜ゆ祦']
- for file in source_files:
- sourceExcel = xw.Book(os.path.join(source_folder, file))
- ssheet1 = sourceExcel.sheets['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
- ssheet2 = sourceExcel.sheets['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
- ssheet3 = sourceExcel.sheets['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
- ssheet4 = sourceExcel.sheets['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
- ssheet5 = sourceExcel.sheets['鍏稿瀷缁忛獙浜ゆ祦']
- for ssheet in [ssheet1, ssheet2, ssheet3, ssheet4, ssheet5]:
- last_row_value = ssheet.range(f'A{ssheet.used_range.rows.count}').value
- if isinstance(last_row_value, str):
- ssheet.range(f'A{ssheet.used_range.rows.count}:AA{ssheet.used_range.rows.count}').delete()
- for (ssheet, tsheet, start_point) in [
- (ssheet1, sheet1, 4),
- (ssheet2, sheet2, 3),
- (ssheet3, sheet3, 3),
- (ssheet4, sheet4, 4),
- (ssheet5, sheet5, 3),
- ]:
- for row in range(start_point, ssheet.used_range.rows.count + 1):
- a_cell_value = ssheet.range(f'A{row}').value
- if not isinstance(a_cell_value, (int, float)):
- continue
- if not all(cell.value is None or cell.value == '' for cell in ssheet.range(f'B{row}:AA{row}')):
- tsheet.range(f'B{tsheet.used_range.rows.count + 1}').value = ssheet.range(f'B{row}:AA{row}').value
- sourceExcel.close()
- for tsheet, start_point in [(sheet1, 4), (sheet2, 3), (sheet3, 3), (sheet4, 4), (sheet5, 3)]:
- last_row = tsheet.used_range.rows.count
- number = 1
- for i in range(start_point, last_row + 1):
- tsheet.range(f'A{i}').value = number
- number += 1
+ # 娓呴櫎鏃犳晥绌虹櫧琛�
+ for ssheet in [ssheet1, ssheet2, ssheet3, ssheet4, ssheet5]:
+ last_row = ssheet.max_row
+ if last_row > 1:
+ for row in range(last_row, 1, -1):
+ if all(ssheet.cell(row=row, column=col).value is None or ssheet.cell(row=row,
+ column=col).value == ''
+ for col in range(1, ssheet.max_column + 1)):
+ ssheet.delete_rows(row)
- timestamp = datetime.now().strftime('%Y-%m-%d_%H-%M-%S')
- output_path = os.path.join(EXCEL_FILES_PATH, f'{timestamp}.xlsx')
- templateExcel.save(output_path)
- templateExcel.close()
- app.quit()
+ # 澶嶅埗鏁版嵁
+ for (ssheet, tsheet, start_point) in [
+ (ssheet1, sheet1, 4),
+ (ssheet2, sheet2, 3),
+ (ssheet3, sheet3, 3),
+ (ssheet4, sheet4, 4),
+ (ssheet5, sheet5, 3),
+ ]:
+ for row in range(start_point, ssheet.max_row + 1):
+ a_cell_value = ssheet.cell(row=row, column=1).value
+ if isinstance(a_cell_value, (int, float)) and any(
+ ssheet.cell(row=row, column=col).value for col in range(2, ssheet.max_column + 1)):
+ tsheet.append(
+ [ssheet.cell(row=row, column=col).value for col in range(1, ssheet.max_column + 1)])
- return timestamp
+ source_excel.close()
+ # 鍦ㄧ洰鏍囧伐浣滆〃涓坊鍔犲簭鍙�
+ for tsheet, start_point in [(sheet1, 4), (sheet2, 3), (sheet3, 3), (sheet4, 4), (sheet5, 3)]:
+ last_row = tsheet.max_row
+ for i in range(start_point, last_row + 1):
+ tsheet.cell(row=i, column=1).value = i - start_point + 1
+ # 淇濆瓨鏂囦欢
+ timestamp = datetime.now().strftime('%Y_%m_%d_%H_%M_%S')
+ output_path = os.path.join(EXCEL_FILES_PATH, f'{timestamp}.xlsx')
+ template_excel.save(output_path)
+ template_excel.close()
+
+ return True
+ except Exception as e:
+ print(f"璇诲彇鏁版嵁鍙戠敓閿欒: {e}")
+ return False
--
Gitblit v1.8.0