Skip to content

Commit 208d5c5

Browse files
authored
feat: 企业微信-打卡-新增返回字段 (#827)
1 parent b5f9a89 commit 208d5c5

File tree

2 files changed

+29
-6
lines changed

2 files changed

+29
-6
lines changed

work/checkin/checkin.go

+1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ type OptionGroupRule struct {
140140
SyncOutCheckin bool `json:"sync_out_checkin,omitempty"`
141141
BukaRemind OptionGroupBukaRemind `json:"buka_remind,omitempty"`
142142
BukaRestriction int64 `json:"buka_restriction,omitempty"`
143+
CheckinMethodType int64 `json:"checkin_method_type,omitempty"`
143144
SpanDayTime int64 `json:"span_day_time,omitempty"`
144145
StandardWorkDuration int64 `json:"standard_work_duration,omitempty"`
145146
}

work/checkin/record.go

+28-6
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,15 @@ type (
173173

174174
// OtInfo 加班信息
175175
OtInfo struct {
176-
OtStatus int64 `json:"ot_status"`
177-
OtDuration int64 `json:"ot_duration"`
178-
ExceptionDuration []uint64 `json:"exception_duration"`
176+
OtStatus int64 `json:"ot_status"`
177+
OtDuration int64 `json:"ot_duration"`
178+
ExceptionDuration []uint64 `json:"exception_duration"`
179+
WorkdayOverAsVacation int64 `json:"workday_over_as_vacation"`
180+
WorkdayOverAsMoney int64 `json:"workday_over_as_money"`
181+
RestdayOverAsVacation int64 `json:"restday_over_as_vacation"`
182+
RestdayOverAsMoney int64 `json:"restday_over_as_money"`
183+
HolidayOverAsVacation int64 `json:"holiday_over_as_vacation"`
184+
HolidayOverAsMoney int64 `json:"holiday_over_as_money"`
179185
}
180186
)
181187

@@ -237,13 +243,20 @@ type (
237243
RegularDays int64 `json:"regular_days"`
238244
RegularWorkSec int64 `json:"regular_work_sec"`
239245
StandardWorkSec int64 `json:"standard_work_sec"`
246+
RestDays int64 `json:"rest_days"`
240247
}
241248

242249
// OverWorkInfo 加班情况
243250
OverWorkInfo struct {
244-
WorkdayOverSec int64 `json:"workday_over_sec"`
245-
HolidayOverSec int64 `json:"holidays_over_sec"`
246-
RestDayOverSec int64 `json:"restdays_over_sec"`
251+
WorkdayOverSec int64 `json:"workday_over_sec"`
252+
HolidayOverSec int64 `json:"holidays_over_sec"`
253+
RestDayOverSec int64 `json:"restdays_over_sec"`
254+
WorkdaysOverAsVacation int64 `json:"workdays_over_as_vacation"`
255+
WorkdaysOverAsMoney int64 `json:"workdays_over_as_money"`
256+
RestdaysOverAsVacation int64 `json:"restdays_over_as_vacation"`
257+
RestdaysOverAsMoney int64 `json:"restdays_over_as_money"`
258+
HolidaysOverAsVacation int64 `json:"holidays_over_as_vacation"`
259+
HolidaysOverAsMoney int64 `json:"holidays_over_as_money"`
247260
}
248261
)
249262

@@ -304,6 +317,10 @@ type CorpOptionGroup struct {
304317
BukaRestriction int64 `json:"buka_restriction"`
305318
ScheduleList []ScheduleList `json:"schedulelist"`
306319
OffWorkIntervalTime int64 `json:"offwork_interval_time"`
320+
SpanDayTime int64 `json:"span_day_time"`
321+
StandardWorkDuration int64 `json:"standard_work_duration"`
322+
OpenSpCheckin bool `json:"open_sp_checkin"`
323+
CheckinMethodType int64 `json:"checkin_method_type"`
307324
}
308325

309326
// GroupCheckinDate 打卡时间,当规则类型为排班时没有意义
@@ -505,6 +522,7 @@ type OptionInfo struct {
505522
type OptionGroup struct {
506523
GroupType int64 `json:"grouptype"`
507524
GroupID int64 `json:"groupid"`
525+
OpenSpCheckin bool `json:"open_sp_checkin"`
508526
GroupName string `json:"groupname"`
509527
CheckinDate []OptionCheckinDate `json:"checkindate"`
510528
SpeWorkdays []SpeWorkdays `json:"spe_workdays"`
@@ -518,6 +536,10 @@ type OptionGroup struct {
518536
LocInfos []LocInfos `json:"loc_infos"`
519537
ScheduleList []ScheduleList `json:"schedulelist"`
520538
BukaRestriction int64 `json:"buka_restriction"`
539+
SpanDayTime int64 `json:"span_day_time"`
540+
StandardWorkDuration int64 `json:"standard_work_duration"`
541+
OffWorkIntervalTime int64 `json:"offwork_interval_time"`
542+
CheckinMethodType int64 `json:"checkin_method_type"`
521543
}
522544

523545
// OptionCheckinDate 打卡时间配置

0 commit comments

Comments
 (0)