正在显示
1 个修改的文件
包含
6 行增加
和
2 行删除
@@ -182,9 +182,13 @@ func (productAttendanceRecord *ProductAttendanceRecord) AttendanceBreakTime(prod | @@ -182,9 +182,13 @@ func (productAttendanceRecord *ProductAttendanceRecord) AttendanceBreakTime(prod | ||
182 | checkSignIn, checkSignOut time.Time | 182 | checkSignIn, checkSignOut time.Time |
183 | ) | 183 | ) |
184 | checkSignIn = v.GetCheckBeginTime(signIn.Local()) | 184 | checkSignIn = v.GetCheckBeginTime(signIn.Local()) |
185 | - checkSignOut = checkSignIn //v.GetCheckEndTime(signIn.Local()) | ||
186 | - if xtime.BeforeEqual(signIn.Local(), checkSignIn) && xtime.AfterEqual(signOut.Local(), checkSignOut) { | 185 | + checkSignOut = v.GetCheckEndTime(signIn.Local()) |
186 | + if xtime.BeforeEqual(signIn.Local(), checkSignIn) && xtime.AfterEqual(signOut.Local(), checkSignIn) { | ||
187 | + if xtime.AfterEqual(signOut.Local(), checkSignOut) { | ||
187 | bt += v.BreakTime | 188 | bt += v.BreakTime |
189 | + } else { | ||
190 | + bt += utils.Round(signOut.Local().Sub(checkSignIn).Hours(), 2) | ||
191 | + } | ||
188 | } | 192 | } |
189 | log.Logger.Debug(fmt.Sprintf("range(%v,%v) actual(%v,%v) break_time:%v", checkSignIn, checkSignOut, signIn.Local(), signOut.Local(), bt)) | 193 | log.Logger.Debug(fmt.Sprintf("range(%v,%v) actual(%v,%v) break_time:%v", checkSignIn, checkSignOut, signIn.Local(), signOut.Local(), bt)) |
190 | } | 194 | } |
-
请 注册 或 登录 后发表评论