!5051 添加功能

Merge pull request !5051 from dev_zhou

yuthon_hr_attendance/models/go_approval.py

@@ -206,12 +206,30 @@ class GoApprovals(models.Model):
             ])
             if attendance_records:
                 attendance_records.write({
+                    'is_clock_card': True,
                     'is_no_card': False,
                     'is_early_card': False,
                     'is_late_card': False,
                     'is_abnormal': False,
                     'absenteeism_card': False
                 })
+            else:
+                current_date = start
+                while current_date <= end:
+                    self.env['hr.attendance'].create({
+                        'employee_id': employee.id,
+                        date_field: current_date,
+                        'is_clock_card': True,
+                        'check_in': False,
+                        'check_out': False,
+                        'is_no_card': False,
+                        'is_early_card': False,
+                        'is_late_card': False,
+                        'is_abnormal': False,
+                        'absenteeism_card': False
+                    })
+                    # 日期递增
+                    current_date += timedelta(days=1)
 
 
 

yuthon_hr_attendance/models/hr_attendance.py

@@ -264,7 +264,7 @@ class HrAttendance(models.Model):
            # 工作日打卡情况判断
             if is_workday:
                 if employee_record:
-                    is_no_card = not employee_record.check_in or not employee_record.check_out
+                    is_no_card = (not employee_record.check_in or not employee_record.check_out) and not employee_record.is_clock_card
                 else:
                     is_no_card = True
             else:

yuthon_hr_attendance/models/hr_attendance_detail_wechat.py

@@ -110,7 +110,7 @@ class HrAttendanceDetail(models.Model):
             for resource_id in role.resource_ids:
                 employee_list.append(resource_id.employee_id.id)
         if not record.employee_id.id in employee_list:
-            days = self.env['yuthon.vacation.reports']._create_leave_record(slot_start_dt, slot_end_dt)
+            days = self.env['yuthon.vacation.reports']._create_leave_record(record.employee_id,slot_start_dt, slot_end_dt)
         else:
             monthly_slots = self.env['planning.slot'].search([
             ('employee_id', '=', record.employee_id.id),