From 36f6fd949c6459ad13e12fb07a8d324bd37b2f11 Mon Sep 17 00:00:00 2001 From: mxr612 Date: Tue, 3 Jun 2025 22:18:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=B7=A5=E9=BE=84?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91=E4=BB=A5=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E5=AD=A6=E9=BE=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改工龄计算公式，增加学龄字段的影响，确保计算结果更准确 - 调整相关单元格的值设置，提升数据的完整性和准确性 --- main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 8034097..a493cf2 100644 --- a/main.py +++ b/main.py @@ -326,9 +326,9 @@ 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=9, value=row["工龄调增"]) + ws.cell(row=6+index, column=7, value=nowtime.year-row["参加工作时间"].year+row["工龄调增"]-row["工龄调减"]+1+row["学龄"]) + ws.cell(row=6+index, column=8, value=nowtime.year-row["参加工作时间"].year+row["工龄调增"]-row["工龄调减"]+1) + 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=12, value=format_time(row["Latest_Prom"], "Latest_Prom"))