返回ticket data列表

hb_server/apps/wf/models.py

@@ -72,7 +72,7 @@ class State(CommonAModel):
     enable_retreat = models.BooleanField('允许撤回', default=False, help_text='开启后允许工单创建人在此状态直接撤回工单到初始状态')
     participant_type = models.IntegerField('参与者类型', choices=type2_choices, default=1, blank=True, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填create_by')
     participant = models.JSONField('参与者', default=list, blank=True, help_text='可以为空(无处理人的情况，如结束状态)、userid、userid列表\部门id\角色id\变量(create_by,create_by_tl)\脚本记录的id等，包含子工作流的需要设置处理人为loonrobot')
-    state_fields = models.JSONField('表单字段', default=dict, help_text='json格式字典存储,包括读写属性1：只读，2：必填，3：可选. 示例：{"created_at":1,"title":2, "sn":1}, 内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称)，state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称')  # json格式存储,包括读写属性1：只读，2：必填，3：可选，4：不显示, 字典的字典
+    state_fields = models.JSONField('表单字段', default=dict, help_text='json格式字典存储,包括读写属性1：只读，2：必填，3：可选. 示例：{"create_time":1,"title":2, "sn":1}, 内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称)，state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称')  # json格式存储,包括读写属性1：只读，2：必填，3：可选，4：不显示, 字典的字典
     distribute_type = models.IntegerField('分配方式', default=1, choices=state_distribute_choices, help_text='1.主动接单(如果当前处理人实际为多人的时候，需要先接单才能处理) 2.直接处理(即使当前处理人实际为多人，也可以直接处理) 3.随机分配(如果实际为多人，则系统会随机分配给其中一个人) 4.全部处理(要求所有参与人都要处理一遍,才能进入下一步)')
 
 class Transition(CommonAModel):

hb_server/apps/wf/serializers.py

@@ -71,6 +71,43 @@ class TicketSerializer(serializers.ModelSerializer):
         queryset = queryset.select_related('workflow','state')
         return queryset
 
+class TicketListSerializer(serializers.ModelSerializer):
+    workflow_ = WorkflowSimpleSerializer(source='workflow', read_only=True)
+    state_ = StateSimpleSerializer(source='state', read_only=True)
+
+    class Meta:
+        model = Ticket
+        fields = ['id', 'title', 'sn', 'workflow', 'workflow_', 'state', 'state_', 'act_state']
+    
+    @staticmethod
+    def setup_eager_loading(queryset):
+        queryset = queryset.select_related('workflow','state')
+        return queryset
+
+class TicketDetailSerializer(serializers.ModelSerializer):
+    workflow_ = WorkflowSimpleSerializer(source='workflow', read_only=True)
+    state_ = StateSimpleSerializer(source='state', read_only=True)
+    ticket_data_ = serializers.SerializerMethodField()
+    class Meta:
+        model = Ticket
+        fields = '__all__'
+    
+    @staticmethod
+    def setup_eager_loading(queryset):
+        queryset = queryset.select_related('workflow','state')
+        return queryset
+
+    def get_ticket_data_(self, obj):
+        ticket_data = obj.ticket_data
+        state_fields = obj.state.state_fields
+        all_fields = CustomField.objects.filter(workflow=obj.workflow).order_by('sort')
+        all_fields_l = CustomFieldSerializer(instance=all_fields, many=True).data
+        for i in all_fields_l:
+            key = i['field_key']
+            i['field_state'] = state_fields.get(key, 1)
+            i['field_value'] = ticket_data.get(key, None)
+        return all_fields_l
+
 class TicketFlowSerializer(serializers.ModelSerializer):
     participant_ = UserSimpleSerializer(source='participant', read_only=True)
     state_ = StateSimpleSerializer(source='state', read_only=True)

hb_server/apps/wf/services.py

@@ -1,3 +1,4 @@
+from apps.wf.serializers import CustomFieldSerializer
 from apps.wf.serializers import TicketSerializer, TicketSimpleSerializer
 from typing import Tuple
 from apps.system.models import User
@@ -212,3 +213,4 @@ class WfService(object):
         return field_info_dict
 
 
+

hb_server/apps/wf/views.py

@@ -2,7 +2,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, TicketHandleSerializer, TicketSerializer, TransitionSerializer, WorkflowSerializer
+from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TicketCreateSerializer, TicketFlowSerializer, TicketHandleSerializer, 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
@@ -101,6 +101,10 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin
             return TicketCreateSerializer
         elif self.action == 'handle':
             return TicketHandleSerializer
+        elif self.action == 'list':
+            return TicketListSerializer
+        elif self.action == 'retrieve':
+            return TicketDetailSerializer
         return super().get_serializer_class()
 
     def create(self, request, *args, **kwargs):