From 286a4dc3522c3ce4105853ebd43259339b2830ec Mon Sep 17 00:00:00 2001 From: mxr612 Date: Tue, 27 May 2025 19:34:04 +0800 Subject: [PATCH] =?UTF-8?q?[Build=201.1.4]=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88=E8=A1=A8=E6=A0=BC=E4=B8=AD?= =?UTF-8?q?=E5=87=BA=E7=94=9F=E5=B9=B4=E6=9C=88=E5=92=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整了表格中出生年月和参加工作时间的格式处理，将格式转换函数应用到正确的单元格位置。同时优化了列顺序，确保职务2和晋升日期显示在正确的位置。 --- main.py | 6 +++--- 个人台账/.gitkeep | 0 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 个人台账/.gitkeep diff --git a/main.py b/main.py index 91c18c8..cb87010 100644 --- a/main.py +++ b/main.py @@ -291,16 +291,16 @@ for index, row in BaseData.iterrows(): # 汇总 ws.cell(row=6+index, column=1, value=index+1) ws.cell(row=6+index, column=2, value=row["姓名"]) ws.cell(row=6+index, column=3, value=row["性别"]) + ws.cell(row=6+index, column=4, value=format_time(row["出生年月"])) + ws.cell(row=6+index, column=5, value=format_time(row["参加工作时间"])) ws.cell(row=6+index, column=6, value=row["学历"]) ws.cell(row=6+index, column=7, value=relativedelta(nowtime, row["入职时间"]).years+row["工龄调增"]-row["工龄调减"]+1) ws.cell(row=6+index, column=8, value=relativedelta(nowtime, row["入职时间"]).years) ws.cell(row=6+index, column=9, value=row["工龄调增"]) ws.cell(row=6+index, column=10, value=row["工龄调减"]) ws.cell(row=6+index, column=11, value=row["Latest_Role"]) - ws.cell(row=6+index, column=13, value=row["职务2"]) - ws.cell(row=6, column=8, value=format_time(row["出生年月"])) - ws.cell(row=6, column=10, value=format_time(row["参加工作时间"])) ws.cell(row=6+index, column=12, value=format_time(row["Latest_Prom"])) + ws.cell(row=6+index, column=13, value=row["职务2"]) ws.cell(row=6+index, column=14, value=format_time(row["日期2"])) except Exception as e: logging.error(f"{row['身份证号码']}:{e}") diff --git a/个人台账/.gitkeep b/个人台账/.gitkeep new file mode 100644 index 0000000..e69de29