修改 把homepage改了回来
This commit is contained in:
parent
bdd424a97b
commit
974bed5fa8
|
@ -541,7 +541,7 @@ def user_homepage_view(request):
|
||||||
on_duty_days = (date.today() - employee_information.entry_date).days
|
on_duty_days = (date.today() - employee_information.entry_date).days
|
||||||
# 查询年假使用表中的年假剩余天数
|
# 查询年假使用表中的年假剩余天数
|
||||||
try:
|
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
|
remaining_annual_leave = annual_leave_records.remaining_annual_leave
|
||||||
used_annual_leave = annual_leave_records.used_annual_leave
|
used_annual_leave = annual_leave_records.used_annual_leave
|
||||||
except AnnualLeaveRecord.DoesNotExist:
|
except AnnualLeaveRecord.DoesNotExist:
|
||||||
|
@ -550,7 +550,7 @@ def user_homepage_view(request):
|
||||||
|
|
||||||
# 查询员工业绩目标表的sales_target,和项目台账的关于这个人今年状态为已完成所有项目的标的金额,用标的金额除以目标表的sales_target得到完成率
|
# 查询员工业绩目标表的sales_target,和项目台账的关于这个人今年状态为已完成所有项目的标的金额,用标的金额除以目标表的sales_target得到完成率
|
||||||
try:
|
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
|
performance_target = employee_performance.sales_target
|
||||||
except EmployeePerformanceTarget.DoesNotExist:
|
except EmployeePerformanceTarget.DoesNotExist:
|
||||||
performance_target = 0
|
performance_target = 0
|
||||||
|
@ -563,14 +563,14 @@ def user_homepage_view(request):
|
||||||
try:
|
try:
|
||||||
# 查询今年进行中的项目
|
# 查询今年进行中的项目
|
||||||
ongoing_projects = ProjectLedger.objects.filter(
|
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='进行中',
|
project_status='进行中',
|
||||||
end_date__range=[start_date, end_date]
|
end_date__range=[start_date, end_date]
|
||||||
).distinct()
|
).distinct()
|
||||||
|
|
||||||
# 查询今年已完成的项目
|
# 查询今年已完成的项目
|
||||||
completed_projects = ProjectLedger.objects.filter(
|
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='完成',
|
project_status='完成',
|
||||||
end_date__range=[start_date, end_date]
|
end_date__range=[start_date, end_date]
|
||||||
).distinct()
|
).distinct()
|
||||||
|
|
Loading…
Reference in New Issue