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

!802 zhou

Browse Source 
Merge pull request !802 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2024-12-17 02:53:58 +00:00
committed by Gitee
parent 8c6848ab54 b88a8b2183
commit 239fbfb989
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/yuthon_shift_planning.py
+4 -4
View File
@@ -96,7 +96,7 @@ class YuthonShiftPlanning(models.Model):
break
weekday_mapping = {
'one': 6, 'two': 0, 'three': 1, 'four': 2, 'five': 3, 'six': 4, 'seven': 5
'one': 0, 'two': 1, 'three': 2, 'four': 3, 'five': 4, 'six': 5, 'seven': 6
}
ever_holidays = {}
# 处理早班员工的休息日
@@ -126,11 +126,11 @@ 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_item, current_date) # 确保这个方法存在
self.create_planning_slot(record, role_a, role_item, current_date) # 确保这个方法存在
current_date += timedelta(days=1)
# 为白班员工创建排班
# 为白班员工创建排班
create_shifts_for_group(self.planning_ever_white_ids, role[0])
# 为中班员工创建排班
# 为中班员工创建排班
create_shifts_for_group(self.planning_ever_noon_ids, role[1])
def create_planning_slot(self, record,role,role_template,current_date):
yuthon_hr_attendance/views/yuthon_shift_planning_views.xml
+4 -4
View File
@@ -25,9 +25,9 @@
<field name="name"/>
<field name="illustrate"/>
<field name="number_of_shifts"/>
<field name="select_time"/>
<field name="select_time" required="1"/>
</group>
<group string="排班安排A组(8:00-17:00)">
<group string="排班安排A组(7:00-15:00)">
<field name="planning_a_ids" string=" ">
<tree editable="bottom">
<field name="sequence" widget="handle" />
@@ -36,7 +36,7 @@
</tree>
</field>
</group>
<group string="排班安排B组(14:00-22:00)">
<group string="排班安排B组(15:00-23:00)">
<field name="planning_b_ids" string=" ">
<tree editable="bottom">
<field name="sequence" widget="handle" />
@@ -45,7 +45,7 @@
</tree>
</field>
</group>
<group string="排班安排C组(22:00-8:00)">
<group string="排班安排C组(11:00-7:00)">
<field name="planning_c_ids" string=" ">
<tree editable="bottom">
<field name="sequence" widget="handle" />