From a5792bb3b2cdd32a1302a474a3c8705d2f5b4db0 Mon Sep 17 00:00:00 2001 From: jiangyong Date: Sun, 23 Mar 2025 00:15:26 +0800 Subject: [PATCH] leavetime --- service/staff_salary.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/service/staff_salary.go b/service/staff_salary.go index 1b730bd..753e26c 100644 --- a/service/staff_salary.go +++ b/service/staff_salary.go @@ -36,12 +36,21 @@ func (s *StaffSalary) CalcSalary(salary *model.StaffSalary, month string) (*mode } entryTime, _ := time.ParseInLocation("2006-01-02", s.user.EntryDate, time.Local) - leaveTime, _ := time.ParseInLocation("2006-01-02", s.user.LeaveDate, time.Local) isEntryMonth := goutil.If(cast.ToInt(entryTime.Format("200601")) == cast.ToInt(month), true, false) - isLeaveMonth := goutil.If(cast.ToInt(leaveTime.Format("200601")) == cast.ToInt(month), true, false) + isLeaveMonth := false - //入职之前或离职之后的工资不计算 - if cast.ToInt(month) < cast.ToInt(entryTime.Format("200601")) || cast.ToInt(month) > cast.ToInt(leaveTime.Format("200601")) { + //已离职的 + if s.user.LeaveDate != "" { + leaveTime, _ := time.ParseInLocation("2006-01-02", s.user.LeaveDate, time.Local) + isLeaveMonth = goutil.If(cast.ToInt(leaveTime.Format("200601")) == cast.ToInt(month), true, false) + //离职之后的不计算工资 + if cast.ToInt(month) > cast.ToInt(leaveTime.Format("200601")) { + return nil, nil + } + } + + //入职之前的工资不计算 + if cast.ToInt(month) < cast.ToInt(entryTime.Format("200601")) { return nil, nil }