jiangyong
/
enterprise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staff salary

This commit is contained in:
jiangyong27 2025-01-07 14:50:27 +08:00
parent 7ab0b375fe
commit f3cc2dc3aa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
service/staff.go
View File

@ -263,6 +263,12 @@ func (s *Staff) getRealWorkDay(entryDate, leaveDate, username, month string) flo
continue continue
} }
////有请假申请的不算出勤
approvalVacation, _ := dao.NewApprovalVacationDao().GetByUsernameDay(username, checkin.Day)
if approvalVacation != nil {
continue
}
//有补卡申请就直接算出勤 //有补卡申请就直接算出勤
approvalCheckin, _ := dao.NewApprovalCheckinDao().GetByUsernameDay(username, checkin.Day) approvalCheckin, _ := dao.NewApprovalCheckinDao().GetByUsernameDay(username, checkin.Day)
if approvalCheckin != nil { if approvalCheckin != nil {
@ -271,12 +277,6 @@ func (s *Staff) getRealWorkDay(entryDate, leaveDate, username, month string) flo
continue continue
} }
////有请假申请的不算出勤
approvalVacation, _ := dao.NewApprovalVacationDao().GetByUsernameDay(username, checkin.Day)
if approvalVacation != nil {
continue
}
// 迟到的按时间折算 // 迟到的按时间折算
if strings.Contains(checkin.Exception, "上班打卡:时间异常") { if strings.Contains(checkin.Exception, "上班打卡:时间异常") {
stTime := time.Unix(checkin.StartTime, 0) stTime := time.Unix(checkin.StartTime, 0)