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

checkin3

This commit is contained in:
jiangyong27 2025-04-01 19:01:38 +08:00
parent 6c9a69707f
commit f3a8931b1b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/api/salary.go
View File

@ -29,7 +29,7 @@ type Salary struct {
UpdateTime string `json:"update_time,omitempty"` UpdateTime string `json:"update_time,omitempty"`
Extra string `json:"extra,omitempty"` Extra string `json:"extra,omitempty"`
Status string `json:"status,omitempty"` Status string `json:"status,omitempty"`
Tags string `json:"tags,omitempty"` AttendStatus string `json:"attend_status,omitempty"`
} }
type CreateSalaryReq struct { type CreateSalaryReq struct {
@ -80,9 +80,9 @@ func (s *Salary) From(m *model.StaffSalary) {
s.Status = cast.ToString(m.Status) s.Status = cast.ToString(m.Status)
if s.AttendDay+s.HolidayDay != s.ShouldDay { if s.AttendDay+s.HolidayDay != s.ShouldDay {
s.Tags = "出勤异常" s.AttendStatus = "2"
} else { } else {
s.Tags = "出勤正常" s.AttendStatus = "1"
} }
} }

10
service/staff_salary.go
View File

@ -297,8 +297,14 @@ func (s *StaffSalary) getRealWorkDay(month string) float64 {
//其他按工作时长结算 //其他按工作时长结算
if checkin.IsCheckin() { if checkin.IsCheckin() {
duration := (float64(checkin.EndTime-checkin.StartTime)/float64(3600) - 1.5) / cast.ToFloat64(corp.GetConfig().WorkerHouer) //减去午休的1.5小时 shouldAttendHour := cast.ToFloat64(corp.GetConfig().WorkerHouer)
realWorkdays += goutil.If(duration > 1, 1, duration) lackSecond := int64(float64(3600)*(1.5+shouldAttendHour)) - (checkin.EndTime - checkin.StartTime) //加上午休的1.5小时
if lackSecond > 0 {
lackHour := float64(lackSecond/3600 + 1) //按小时取整
realWorkdays += goutil.If(lackHour > shouldAttendHour, 0, 1-lackHour/shouldAttendHour)
} else {
realWorkdays += 1
}
} }
} }
return realWorkdays return realWorkdays