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