pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!714 zhou

Browse Source 
Merge pull request !714 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2024-12-11 02:16:08 +00:00
committed by Gitee
parent 5c1cc21fce 142687663a
commit a69c817f4e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/yuthon_shift_planning.py
+9 -4
View File
@@ -25,8 +25,8 @@ class YuthonShiftPlanning(models.Model):
role = [role_template_a, role_template_b, role_template_c]
planning_groups = {
'planning_a_ids': range(len(role)), # 默认顺序: 早 -> 中 -> 夜
'planning_b_ids': [1, 2, 0], # 中 -> 夜 -> 早
'planning_c_ids': [2, 0, 1] # 夜 -> 早 -> 中
'planning_c_ids': [1, 2, 0], # 中 -> 夜 -> 早
'planning_b_ids': [2, 0, 1], # 夜 -> 早 -> 中
}
weekday_mapping = {
@@ -60,12 +60,17 @@ class YuthonShiftPlanning(models.Model):
if resource_id in ever_holidays and current_weekday in ever_holidays[resource_id]:
pass # 跳过休息日
else:
self.create_planning_slot(record, role_a, role[role_index], current_date)
if current_date.day == 31:
self.create_planning_slot(record, role_a, role[role_index-1], current_date)
else:
self.create_planning_slot(record, role_a, role[role_index], current_date)
current_date += timedelta(days=1)
if current_date >= end_date:
break
if current_date >= end_date:
break
if current_date >= end_date: # 检查是否月末且已排完当前组
break
weekday_mapping = {
'one': 6, 'two': 0, 'three': 1, 'four': 2, 'five': 3, 'six': 4, 'seven': 5
@@ -96,7 +101,7 @@ class YuthonShiftPlanning(models.Model):
while current_date <= end_date:
current_weekday = current_date.weekday()
if resource_id in ever_holidays and current_weekday in ever_holidays[resource_id]:
pass # 跳过休息日
pass
else:
self.create_planning_slot(record, role_a,role_item, current_date) # 确保这个方法存在
current_date += timedelta(days=1)