From 82ada27c91f5f7dbe1b681a0c155e1a5fedb4219 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 18 Feb 2022 14:09:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=A3=80=E6=9F=A5=E8=A1=A8bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/hrm/views.py | 2 ++ hb_server/apps/mtm/views.py | 33 +++++++++++++++++---------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/hb_server/apps/hrm/views.py b/hb_server/apps/hrm/views.py index d877923..8313ad4 100644 --- a/hb_server/apps/hrm/views.py +++ b/hb_server/apps/hrm/views.py @@ -60,6 +60,8 @@ class EmployeeViewSet(CreateUpdateModelAMixin, OptimizationMixin, UpdateModelMix """ 填写离岗说明 """ + serializer = self.get_serializer(data=request.data) + serializer.is_valid(raise_exception=True) obj = self.get_object() if not obj.is_atwork: remark = request.data.get('not_work_remark', '') diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index 7aaf203..5a89d8b 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -185,6 +185,23 @@ class RecordFormViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet instance = self.get_object() serializer = self.serializer_class(instance=RecordFormField.objects.filter(form=instance, is_deleted=False), many=True) return Response(serializer.data) + + @transaction.atomic + def create(self, request, *args, **kwargs): + serializer = self.get_serializer(data=request.data) + serializer.is_valid(raise_exception=True) + vdata = serializer.validated_data + form = vdata.pop('form', None) + instance = RecordForm(**vdata) + instance.create_by = request.user + instance.save() + if form: + for i in RecordFormField.objects.filter(form=form, is_deleted=False): + i.pk = None + i.form = instance + i.parent = None + i.save() + return Response() @@ -208,22 +225,6 @@ class RecordFormFieldViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelVi return RecordFormFieldUpdateSerializer return RecordFormFieldSerializer - @transaction.atomic - def create(self, request, *args, **kwargs): - serializer = self.get_serializer(data=request.data) - serializer.is_valid(raise_exception=True) - vdata = serializer.validated_data - form = vdata.pop('form', None) - instance = RecordForm(**vdata) - instance.save(create_by=request.user) - if form: - for i in RecordFormField.objects.filter(form=form, is_deleted=False): - i.pk = None - i.form = instance - i.parent = None - i.save() - return super().create(request, *args, **kwargs) - class TechDocViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet): """ 技术文件增删改查