query_params._mutable
This commit is contained in:
parent
c9b71edf3d
commit
f58311bbc4
|
@ -43,6 +43,7 @@ class EmployeeViewSet(CustomModelViewSet):
|
||||||
|
|
||||||
def filter_queryset(self, queryset):
|
def filter_queryset(self, queryset):
|
||||||
if not self.detail:
|
if not self.detail:
|
||||||
|
self.request.query_params._mutable = True
|
||||||
self.request.query_params.setdefault('type', 'employee')
|
self.request.query_params.setdefault('type', 'employee')
|
||||||
return super().filter_queryset(queryset)
|
return super().filter_queryset(queryset)
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,11 @@ def get_op_workers(state, ticket, new_ticket_data, handler):
|
||||||
return list(OplWorker.objects.filter(opl=opl).values_list('worker__id', flat=True))
|
return list(OplWorker.objects.filter(opl=opl).values_list('worker__id', flat=True))
|
||||||
|
|
||||||
|
|
||||||
|
def get_op_monitor(state, ticket, new_ticket_data, handler):
|
||||||
|
opl = Opl.objects.filter(ticket=ticket).first()
|
||||||
|
if opl:
|
||||||
|
return [opl.monitor.id]
|
||||||
|
|
||||||
def bind_opl(ticket: Ticket, transition: Transition, new_ticket_data: dict):
|
def bind_opl(ticket: Ticket, transition: Transition, new_ticket_data: dict):
|
||||||
opl = Opl.objects.get(id=new_ticket_data['opl'])
|
opl = Opl.objects.get(id=new_ticket_data['opl'])
|
||||||
ticket_data = ticket.ticket_data
|
ticket_data = ticket.ticket_data
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
|
from threading import Thread
|
||||||
from apps.hrm.models import Employee
|
from apps.hrm.models import Employee
|
||||||
|
from apps.hrm.services import HrmService
|
||||||
from apps.wf.models import Ticket, Transition
|
from apps.wf.models import Ticket, Transition
|
||||||
from apps.rpm.models import Rcertificate, Rpj, Rpjmember
|
from apps.rpm.models import Rcertificate, Rpj, Rpjmember
|
||||||
|
|
||||||
|
@ -35,7 +37,7 @@ def rpj_audit_end(ticket):
|
||||||
rep.save()
|
rep.save()
|
||||||
# 更新入厂项目人员证书库
|
# 更新入厂项目人员证书库
|
||||||
for i in Rcertificate.objects.filter(rpj=rpj):
|
for i in Rcertificate.objects.filter(rpj=rpj):
|
||||||
|
pass
|
||||||
# 同步至大华人员库并下发人脸
|
# 同步至大华人员库并下发人脸
|
||||||
Thread(target=HrmService.sync_dahua_employee, args=(ep, '', visit.visit_time, visit.leave_time)).start()
|
Thread(target=HrmService.sync_dahua_employee, args=(ep, '', rpj.come_time, rpj.leave_time)).start()
|
||||||
# 发送通知?
|
# 发送通知?
|
||||||
|
|
|
@ -315,6 +315,7 @@ class DeptViewSet(CustomModelViewSet):
|
||||||
|
|
||||||
def filter_queryset(self, queryset):
|
def filter_queryset(self, queryset):
|
||||||
if not self.detail:
|
if not self.detail:
|
||||||
|
self.request.query_params._mutable = True
|
||||||
self.request.query_params.setdefault('type', 'dept')
|
self.request.query_params.setdefault('type', 'dept')
|
||||||
return super().filter_queryset(queryset)
|
return super().filter_queryset(queryset)
|
||||||
|
|
||||||
|
@ -402,6 +403,7 @@ class UserViewSet(CustomModelViewSet):
|
||||||
|
|
||||||
def filter_queryset(self, queryset):
|
def filter_queryset(self, queryset):
|
||||||
if not self.detail:
|
if not self.detail:
|
||||||
|
self.request.query_params._mutable = True
|
||||||
self.request.query_params.setdefault('type', 'employee')
|
self.request.query_params.setdefault('type', 'employee')
|
||||||
return super().filter_queryset(queryset)
|
return super().filter_queryset(queryset)
|
||||||
|
|
||||||
|
|
|
@ -365,6 +365,11 @@ class WfService(object):
|
||||||
participant_type=0, intervene_type=Transition.TRANSITION_INTERVENE_TYPE_CC,
|
participant_type=0, intervene_type=Transition.TRANSITION_INTERVENE_TYPE_CC,
|
||||||
participant=None, participant_cc=destination_state.participant_cc)
|
participant=None, participant_cc=destination_state.participant_cc)
|
||||||
|
|
||||||
|
if destination_state.type == State.STATE_TYPE_END:
|
||||||
|
TicketFlow.objects.create(ticket=ticket, state=destination_state,
|
||||||
|
participant_type=0, intervene_type=0,
|
||||||
|
participant=None)
|
||||||
|
|
||||||
cls.task_ticket(ticket=ticket)
|
cls.task_ticket(ticket=ticket)
|
||||||
|
|
||||||
return ticket
|
return ticket
|
||||||
|
|
Loading…
Reference in New Issue