diff --git a/User/utils.py b/User/utils.py index 37505e7..04ca1bc 100644 --- a/User/utils.py +++ b/User/utils.py @@ -826,9 +826,9 @@ def process_approval_flow(approval, business_record, current_approver, state, logger.info(f"process_approval_flow: 已更新审批记录,personincharge={next_approver}, state=审核中") return False, None else: - # 最后一个审核人已通过:投标/立项/案件变更转申请人待查看,其他类型抄送财务 + # 最后一个审核人已通过:投标/立项/案件变更/结案申请转申请人待查看,其他类型抄送财务 applicant = getattr(approval, 'applicant', None) - if approval_type in ("投标登记", "立项登记", "案件变更") and applicant: + if approval_type in ("投标登记", "立项登记", "案件变更", "结案申请") and applicant: logger.info(f"process_approval_flow: 最后一个审核人已审核,流转到申请人待查看: {applicant}") approval.personincharge = applicant approval.state = "待查看" @@ -941,8 +941,8 @@ def create_approval_with_team_logic(team_name, approvers, title, content, approv # 创建审批记录,第一个审核人 first_approver = approvers_list[0] approvers_str = ' → '.join(approvers_list) # 使用箭头表示顺序 - # 投标登记/立项登记/案件变更:最后一步给申请人(待查看),不再给财务部 - if approval_type in ("投标登记", "立项登记", "案件变更") and applicant: + # 投标登记/立项登记/案件变更/结案申请:最后一步给申请人(待查看),不再给财务部 + if approval_type in ("投标登记", "立项登记", "案件变更", "结案申请") and applicant: flow_suffix = " → 申请人(待查看)" else: flow_suffix = " → 财务部(按顺序审批)" @@ -970,8 +970,8 @@ def create_approval_with_team_logic(team_name, approvers, title, content, approv # 如果没有传入审核人,则根据团队类型判断 # 判断团队类型 if not team_name or not team or (team and team.team_type == 'personal'): - # 投标登记/立项登记/案件变更且传入了申请人:最后一步给申请人,生成待查看待办(不再给财务部) - if approval_type in ("投标登记", "立项登记", "案件变更") and applicant: + # 投标登记/立项登记/案件变更/结案申请且传入了申请人:最后一步给申请人,生成待查看待办(不再给财务部) + if approval_type in ("投标登记", "立项登记", "案件变更", "结案申请") and applicant: content_to_save = content + ",待申请人查看" approval = Approval.objects.create( title=title, @@ -1056,7 +1056,7 @@ def create_approval_with_team_logic(team_name, approvers, title, content, approv # 创建审批记录,第一个审核人 first_approver = approvers_list[0] approvers_str = ' → '.join(approvers_list) - if approval_type in ("投标登记", "立项登记", "案件变更") and applicant: + if approval_type in ("投标登记", "立项登记", "案件变更", "结案申请") and applicant: flow_suffix = " → 申请人(待查看)" else: flow_suffix = " → 财务部(按顺序审批)" diff --git a/business/views.py b/business/views.py index e043012..747ea03 100644 --- a/business/views.py +++ b/business/views.py @@ -1648,7 +1648,8 @@ class CaseAttachmentUpdate(APIView): approval_type="结案申请", user_id=schedule.id, business_record=schedule, - today=today + today=today, + applicant=submitter.username if submitter else None # 传入申请人,用于"待查看"流程 ) if approval is None and needs_approval: