From b04495a621f55c61c6e9123e00ba51cfed753467 Mon Sep 17 00:00:00 2001 From: mxr612 Date: Mon, 2 Jun 2025 16:32:02 +0800 Subject: [PATCH] =?UTF-8?q?[Build=201.1.6]=20fix:=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E5=B7=A5=E9=BE=84=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8F=82=E5=8A=A0=E5=B7=A5=E4=BD=9C=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=9B=BF=E4=BB=A3=E5=85=A5=E8=81=8C=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新工龄计算公式，确保使用正确的时间字段进行计算 - 调整相关单元格的值设置，提升数据准确性 --- main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 4c418da..a550ea4 100644 --- a/main.py +++ b/main.py @@ -288,8 +288,8 @@ for index, row in BaseData.iterrows(): # 汇总 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=nowtime.year-row["入职时间"].year+row["工龄调增"]-row["工龄调减"]+1) - ws.cell(row=6+index, column=8, value=nowtime.year-row["入职时间"].year) + ws.cell(row=6+index, column=7, value=nowtime.year-row["参加工作时间"].year+row["工龄调增"]-row["工龄调减"]+1) + ws.cell(row=6+index, column=8, value=nowtime.year-row["参加工作时间"].year) 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"])