diff --git a/application/accounts/views.py b/application/accounts/views.py index f785398..afe08dd 100644 --- a/application/accounts/views.py +++ b/application/accounts/views.py @@ -541,7 +541,7 @@ def user_homepage_view(request): on_duty_days = (date.today() - employee_information.entry_date).days # 查询年假使用表中的年假剩余天数 try: - annual_leave_records = AnnualLeaveRecord.objects.get(employee=employee_information) + annual_leave_records = AnnualLeaveRecord.objects.get(employee_name__icontains=employee_information.name) remaining_annual_leave = annual_leave_records.remaining_annual_leave used_annual_leave = annual_leave_records.used_annual_leave except AnnualLeaveRecord.DoesNotExist: @@ -550,7 +550,7 @@ def user_homepage_view(request): # 查询员工业绩目标表的sales_target,和项目台账的关于这个人今年状态为已完成所有项目的标的金额,用标的金额除以目标表的sales_target得到完成率 try: - employee_performance = EmployeePerformanceTarget.objects.get(name=employee_information.employee_id) + employee_performance = EmployeePerformanceTarget.objects.get(name=employee_information.name) performance_target = employee_performance.sales_target except EmployeePerformanceTarget.DoesNotExist: performance_target = 0 @@ -563,14 +563,14 @@ def user_homepage_view(request): try: # 查询今年进行中的项目 ongoing_projects = ProjectLedger.objects.filter( - Q(project_leader=employee_information) | Q(project_members=employee_information), + Q(project_leader=employee_information.name) | Q(project_members__contains=employee_information.name), project_status='进行中', end_date__range=[start_date, end_date] ).distinct() # 查询今年已完成的项目 completed_projects = ProjectLedger.objects.filter( - Q(project_leader=employee_information) | Q(project_members=employee_information), + Q(project_leader=employee_information.name) | Q(project_members__contains=employee_information.name), project_status='完成', end_date__range=[start_date, end_date] ).distinct()