From 243613bfdfd2224fe5e55ffd3c3b6ca6ce8a56cc Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 13 Oct 2021 11:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=B7=A5=E5=8D=95=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/services.py    | 13 ++++++++++++-
 hb_server/apps/wf/views.py       | 20 ++++++++++++++++++--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py
index 9075341..d560ad4 100644
--- a/hb_server/apps/wf/serializers.py
+++ b/hb_server/apps/wf/serializers.py
@@ -129,4 +129,7 @@ class TicketHandleSerializer(serializers.Serializer):
     suggestion = serializers.CharField(label="处理意见", required = False)
 
 class TicketRetreatSerializer(serializers.Serializer):
-    suggestion = serializers.CharField(label="撤回原因", required = False)
\ No newline at end of file
+    suggestion = serializers.CharField(label="撤回原因", required = False)
+
+class TicketCloseSerializer(serializers.Serializer):
+    suggestion = serializers.CharField(label="关闭原因", required = False)
\ No newline at end of file
diff --git a/hb_server/apps/wf/services.py b/hb_server/apps/wf/services.py
index c86fcb7..98730eb 100644
--- a/hb_server/apps/wf/services.py
+++ b/hb_server/apps/wf/services.py
@@ -32,7 +32,18 @@ class WfService(object):
             return wf_state_obj
         except:
             raise Exception('工作流状态配置错误')
-    
+
+    @staticmethod
+    def get_workflow_end_state(workflow:Workflow):
+        """
+        获取工作流结束状态
+        """
+        try:
+            wf_state_obj = State.objects.get(workflow=workflow, type=State.STATE_TYPE_END, is_deleted=False)
+            return wf_state_obj
+        except:
+            raise Exception('工作流状态配置错误')
+
     @staticmethod
     def get_workflow_custom_fields(workflow:Workflow):
         """
diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py
index a1aab22..bf733e6 100644
--- a/hb_server/apps/wf/views.py
+++ b/hb_server/apps/wf/views.py
@@ -3,7 +3,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, TicketCreateSerializer, TicketFlowSerializer, TicketFlowSimpleSerializer, TicketHandleSerializer, TicketRetreatSerializer, TicketSerializer, TransitionSerializer, WorkflowSerializer, TicketListSerializer, TicketDetailSerializer
+from apps.wf.serializers import CustomFieldSerializer, StateSerializer, 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
@@ -318,10 +318,26 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin
         加签
         """
 
+    @action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=TicketCloseSerializer)
     def close(self, request, pk=None):
         """
-        关闭工单(超级管理员或者创建人在初始状态)
+        关闭工单(创建人在初始状态)
         """
+        ticket = self.get_object()
+        if ticket.state.type == State.STATE_TYPE_START and ticket.create_by==request.user:
+            end_state = WfService.get_workflow_end_state(ticket.workflow)
+            ticket.state = end_state
+            ticket.participant_type = State.PARTICIPANT_TYPE_PERSONAL
+            ticket.participant = request.user.id
+            ticket.act_state = Ticket.TICKET_ACT_STATE_CLOSED
+            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_CLOSE,
+                            participant=request.user, transition=None)
+        else:
+            raise APIException('工单不可关闭')
 
 
 class TicketFlowViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):