正在显示
1 个修改的文件
包含
5 行增加
和
1 行删除
| @@ -2,8 +2,10 @@ package domain | @@ -2,8 +2,10 @@ package domain | ||
| 2 | 2 | ||
| 3 | import ( | 3 | import ( |
| 4 | "errors" | 4 | "errors" |
| 5 | + "fmt" | ||
| 5 | "github.com/linmadan/egglib-go/utils/xtime" | 6 | "github.com/linmadan/egglib-go/utils/xtime" |
| 6 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils" | 7 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils" |
| 8 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/log" | ||
| 7 | "time" | 9 | "time" |
| 8 | ) | 10 | ) |
| 9 | 11 | ||
| @@ -184,8 +186,10 @@ func (productAttendanceRecord *ProductAttendanceRecord) AttendanceBreakTime(prod | @@ -184,8 +186,10 @@ func (productAttendanceRecord *ProductAttendanceRecord) AttendanceBreakTime(prod | ||
| 184 | if xtime.BeforeEqual(signIn.Local(), checkSignIn) && xtime.AfterEqual(signOut.Local(), checkSignOut) { | 186 | if xtime.BeforeEqual(signIn.Local(), checkSignIn) && xtime.AfterEqual(signOut.Local(), checkSignOut) { |
| 185 | bt += v.BreakTime | 187 | bt += v.BreakTime |
| 186 | } | 188 | } |
| 187 | - //log.Logger.Debug(fmt.Sprintf("range(%v,%v) actual(%v,%v)",checkSignIn,checkSignOut,signIn.Local(),signOut.Local())) | 189 | + log.Logger.Debug(fmt.Sprintf("range(%v,%v) actual(%v,%v)", checkSignIn, checkSignOut, signIn.Local(), signOut.Local())) |
| 188 | } | 190 | } |
| 191 | + if productAttendanceRecord.Ext != nil && productAttendanceRecord.Ext.AttendanceExt != nil { | ||
| 189 | productAttendanceRecord.Ext.AttendanceExt.BreakTime = bt | 192 | productAttendanceRecord.Ext.AttendanceExt.BreakTime = bt |
| 193 | + } | ||
| 190 | return bt | 194 | return bt |
| 191 | } | 195 | } |
-
请 注册 或 登录 后发表评论