From 17d653ee7a1ad4aea26fbe1b6cfe80f501045070 Mon Sep 17 00:00:00 2001 From: mxr612 Date: Sat, 14 Jun 2025 04:26:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A1=AB=E5=85=85=E9=80=BB=E8=BE=91=E4=BB=A5?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8F=98=E5=8A=A8=E5=90=8E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将历史记录填充函数中的字段从原始字段改为变动后字段，以正确反映历史记录中的最新数据。同时保留时间字段的异常处理逻辑。 --- main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 36a8624..26180f9 100644 --- a/main.py +++ b/main.py @@ -269,14 +269,14 @@ def fill_history_info(ws, History_pd):# 填充历史记录 for col in range(1, 11): # 复制样式 ws.cell(row=H_START+index, column=col)._style = ws.cell(row=H_START, column=col)._style try: - ws.cell(row=H_START+index, column=1, value=format_time(hrow["时间"],"历史时间")) + ws.cell(row=H_START+index, column=1, value=format_time(hrow["变动后时间"],"历史时间")) except: logging.warning(f"历史时间格式错误：{hrow['时间']}") - ws.cell(row=H_START+index, column=2, value=hrow["职务"]) - ws.cell(row=H_START+index, column=3, value=hrow["职务工资"]) - ws.cell(row=H_START+index, column=4, value=hrow["级别档次"]) - ws.cell(row=H_START+index, column=5, value=hrow["级别工资"]) - ws.cell(row=H_START+index, column=6, value=hrow["工资合计"]) + ws.cell(row=H_START+index, column=2, value=hrow["变动后职务"]) + ws.cell(row=H_START+index, column=3, value=hrow["变动后职务工资"]) + ws.cell(row=H_START+index, column=4, value=hrow["变动后级别档次"]) + ws.cell(row=H_START+index, column=5, value=hrow["变动后级别工资"]) + ws.cell(row=H_START+index, column=6, value=hrow["变动后工资合计"]) ws.cell(row=H_START+index, column=7, value=hrow["变动原因"]) # ws.cell(row=H_START+index, column=8, value=index) # Debug