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

checkin2

This commit is contained in:
jiangyong27 2025-04-01 18:36:30 +08:00
parent ac2e7666f3
commit 6c9a69707f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/model/checkin.go
View File

@ -1,5 +1,7 @@
package model package model
import "strings"
type Checkin struct { type Checkin struct {
Id int64 Id int64
CorpId int64 CorpId int64
@ -13,3 +15,11 @@ type Checkin struct {
CreateTime int64 CreateTime int64
UpdateTime int64 UpdateTime int64
} }
func (c *Checkin) IsCheckin() bool {
return c.EndTime > 0 && c.StartTime > 0 && c.EndTime > c.StartTime
}
func (c *Checkin) IsNormal() bool {
return strings.Trim(c.Exception, "\r\t\n ") == ""
}

4
service/staff_salary.go
View File

@ -282,7 +282,7 @@ func (s *StaffSalary) getRealWorkDay(month string) float64 {
continue continue
} }
if checkin.Exception == "" { if checkin.IsNormal() {
realWorkdays += 1 realWorkdays += 1
continue continue
} }
@ -296,7 +296,7 @@ func (s *StaffSalary) getRealWorkDay(month string) float64 {
} }
//其他按工作时长结算 //其他按工作时长结算
if checkin.EndTime > 0 && checkin.StartTime > 0 { if checkin.IsCheckin() {
duration := (float64(checkin.EndTime-checkin.StartTime)/float64(3600) - 1.5) / cast.ToFloat64(corp.GetConfig().WorkerHouer) //减去午休的1.5小时 duration := (float64(checkin.EndTime-checkin.StartTime)/float64(3600) - 1.5) / cast.ToFloat64(corp.GetConfig().WorkerHouer) //减去午休的1.5小时
realWorkdays += goutil.If(duration > 1, 1, duration) realWorkdays += goutil.If(duration > 1, 1, duration)
} }