From f6dab8e2f35277487ec35063ed13f55c9e08c36e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 14 Oct 2021 09:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E5=AE=8C=E6=88=90=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/wf/serializers.py |  5 ++++-
 hb_server/apps/wf/views.py       | 22 +++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py
index ca8f9c6..b9256bd 100644
--- a/hb_server/apps/wf/serializers.py
+++ b/hb_server/apps/wf/serializers.py
@@ -136,4 +136,7 @@ class TicketCloseSerializer(serializers.Serializer):
 
 class TicketAddNodeSerializer(serializers.Serializer):
     suggestion = serializers.CharField(label="加签说明", required = False)
-    add_node_man = serializers.IntegerField(label='加签人')
\ No newline at end of file
+    add_node_man = serializers.IntegerField(label='加签人')
+
+class TicketAddNodeEndSerializer(serializers.Serializer):
+    suggestion = serializers.CharField(label="加签意见", required = False)
\ No newline at end of file
diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py
index f2eba4a..ddc9bc2 100644
--- a/hb_server/apps/wf/views.py
+++ b/hb_server/apps/wf/views.py
@@ -4,7 +4,7 @@ from django.core.exceptions import AppRegistryNotReady
 from rest_framework.response import Response
 from rest_framework import serializers
 from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModelMixin, RetrieveModelMixin, UpdateModelMixin
-from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TicketAddNodeSerializer, TicketCloseSerializer, TicketCreateSerializer, TicketFlowSerializer, TicketFlowSimpleSerializer, TicketHandleSerializer, TicketRetreatSerializer, TicketSerializer, TransitionSerializer, WorkflowSerializer, TicketListSerializer, TicketDetailSerializer
+from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TicketAddNodeEndSerializer, TicketAddNodeSerializer, TicketCloseSerializer, TicketCreateSerializer, TicketFlowSerializer, TicketFlowSimpleSerializer, TicketHandleSerializer, TicketRetreatSerializer, TicketSerializer, TransitionSerializer, WorkflowSerializer, TicketListSerializer, TicketDetailSerializer
 from django.shortcuts import get_object_or_404, render
 from rest_framework.viewsets import GenericViewSet, ModelViewSet
 from rest_framework.decorators import action, api_view
@@ -325,7 +325,7 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin
         ticket.participant_type = State.PARTICIPANT_TYPE_PERSONAL
         ticket.participant = add_user.id
         ticket.in_add_node = True
-        ticket.add_node_man = add_user
+        ticket.add_node_man = request.user
         ticket.save()
         # 更新流转记录
         suggestion = request.data.get('suggestion', '') # 加签说明
@@ -334,8 +334,24 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin
                         participant=request.user, transition=None)
         return Response()
 
+    @action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=TicketAddNodeEndSerializer)
+    def add_node_end(self, request, pk=None):
+        """
+        加签完成
+        """
+        ticket = self.get_object()
+        ticket.participant_type = State.PARTICIPANT_TYPE_PERSONAL
+        ticket.in_add_node = False
+        ticket.add_node_man = None
+        ticket.participant = ticket.add_node_man.id
+        ticket.save()
+        # 更新流转记录
+        suggestion = request.data.get('suggestion', '') # 加签意见
+        TicketFlow.objects.create(ticket=ticket, state=ticket.state, ticket_data=WfService.get_ticket_all_field_value(ticket),
+                        suggestion=suggestion, participant_type=State.PARTICIPANT_TYPE_PERSONAL, intervene_type=Transition.TRANSITION_INTERVENE_TYPE_ADD_NODE_END,
+                        participant=request.user, transition=None)
+        return Response()
     
-        
 
     @action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=TicketCloseSerializer)
     def close(self, request, pk=None):