修复创建案件
This commit is contained in:
@@ -691,6 +691,38 @@ class roxyExhibition(APIView):
|
||||
deleted_project_ids = ProjectRegistration.objects.filter(is_deleted=True).values_list('id', flat=True)
|
||||
deleted_project_ids_str = [str(pid) for pid in deleted_project_ids]
|
||||
|
||||
# 获取所有已删除的收入确认ID
|
||||
deleted_income_ids = Income.objects.filter(is_deleted=True).values_list('id', flat=True)
|
||||
deleted_income_ids_str = [str(iid) for iid in deleted_income_ids]
|
||||
|
||||
# 获取所有已删除的开票ID
|
||||
deleted_invoice_ids = Invoice.objects.filter(is_deleted=True).values_list('id', flat=True)
|
||||
deleted_invoice_ids_str = [str(iid) for iid in deleted_invoice_ids]
|
||||
|
||||
# 获取所有已删除的调账申请ID
|
||||
deleted_accounts_ids = Accounts.objects.filter(is_deleted=True).values_list('id', flat=True)
|
||||
deleted_accounts_ids_str = [str(aid) for aid in deleted_accounts_ids]
|
||||
|
||||
# 获取所有已删除的付款申请ID
|
||||
deleted_payment_ids = Payment.objects.filter(is_deleted=True).values_list('id', flat=True)
|
||||
deleted_payment_ids_str = [str(pid) for pid in deleted_payment_ids]
|
||||
|
||||
# 获取所有已删除的报销申请ID
|
||||
deleted_reimbursement_ids = Reimbursement.objects.filter(is_deleted=True).values_list('id', flat=True)
|
||||
deleted_reimbursement_ids_str = [str(rid) for rid in deleted_reimbursement_ids]
|
||||
|
||||
# 获取所有已删除的工资/奖金变更ID
|
||||
deleted_bonus_change_ids = BonusChange.objects.filter(is_deleted=True).values_list('id', flat=True)
|
||||
deleted_bonus_change_ids_str = [str(bid) for bid in deleted_bonus_change_ids]
|
||||
|
||||
# 获取所有已删除的申请用印ID
|
||||
deleted_seal_application_ids = SealApplication.objects.filter(is_deleted=True).values_list('id', flat=True)
|
||||
deleted_seal_application_ids_str = [str(sid) for sid in deleted_seal_application_ids]
|
||||
|
||||
# 获取所有已删除的用户ID(用于入职财务登记和离职财务登记)
|
||||
deleted_user_ids = User.objects.filter(is_deleted=True).values_list('id', flat=True)
|
||||
deleted_user_ids_str = [str(uid) for uid in deleted_user_ids]
|
||||
|
||||
# 排除关联的业务记录已被删除的审批记录
|
||||
exclude_conditions = Q()
|
||||
|
||||
@@ -706,6 +738,42 @@ class roxyExhibition(APIView):
|
||||
if deleted_project_ids_str:
|
||||
exclude_conditions |= Q(type="立项登记") & Q(user_id__in=deleted_project_ids_str)
|
||||
|
||||
# 排除 type="收入确认" 且关联的收入确认已被删除的审批记录
|
||||
if deleted_income_ids_str:
|
||||
exclude_conditions |= Q(type="收入确认") & Q(user_id__in=deleted_income_ids_str)
|
||||
|
||||
# 排除 type="开票" 且关联的开票已被删除的审批记录
|
||||
if deleted_invoice_ids_str:
|
||||
exclude_conditions |= Q(type="开票") & Q(user_id__in=deleted_invoice_ids_str)
|
||||
|
||||
# 排除 type="调账申请" 且关联的调账申请已被删除的审批记录
|
||||
if deleted_accounts_ids_str:
|
||||
exclude_conditions |= Q(type="调账申请") & Q(user_id__in=deleted_accounts_ids_str)
|
||||
|
||||
# 排除 type="付款申请" 且关联的付款申请已被删除的审批记录
|
||||
if deleted_payment_ids_str:
|
||||
exclude_conditions |= Q(type="付款申请") & Q(user_id__in=deleted_payment_ids_str)
|
||||
|
||||
# 排除 type="报销申请" 且关联的报销申请已被删除的审批记录
|
||||
if deleted_reimbursement_ids_str:
|
||||
exclude_conditions |= Q(type="报销申请") & Q(user_id__in=deleted_reimbursement_ids_str)
|
||||
|
||||
# 排除 type="工资/奖金变更" 且关联的工资/奖金变更已被删除的审批记录
|
||||
if deleted_bonus_change_ids_str:
|
||||
exclude_conditions |= Q(type="工资/奖金变更") & Q(user_id__in=deleted_bonus_change_ids_str)
|
||||
|
||||
# 排除 type="申请用印" 且关联的申请用印已被删除的审批记录
|
||||
if deleted_seal_application_ids_str:
|
||||
exclude_conditions |= Q(type="申请用印") & Q(user_id__in=deleted_seal_application_ids_str)
|
||||
|
||||
# 排除 type="入职财务登记" 且关联的用户已被删除的审批记录
|
||||
if deleted_user_ids_str:
|
||||
exclude_conditions |= Q(type="入职财务登记") & Q(user_id__in=deleted_user_ids_str)
|
||||
|
||||
# 排除 type="离职财务登记" 且关联的用户已被删除的审批记录
|
||||
if deleted_user_ids_str:
|
||||
exclude_conditions |= Q(type="离职财务登记") & Q(user_id__in=deleted_user_ids_str)
|
||||
|
||||
if exclude_conditions:
|
||||
approvals = approvals.exclude(exclude_conditions)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user