From 9d7739ae59dbdd49a180b0926eca8efcd71ea0aa Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 24 Mar 2023 15:31:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=88=90=E5=91=98=E7=A6=BB=E5=8E=82?= =?UTF-8?q?=E6=9C=89=E9=99=90=E5=88=B6/=E5=A4=A7=E5=8D=8E=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E6=89=8D=E6=A0=A1=E9=AA=8C=E5=9B=BE=E7=89=87=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/rpm/serializers.py | 7 +++++-- apps/rpm/views.py | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/rpm/serializers.py b/apps/rpm/serializers.py index da2251c0..4cc4ddaa 100644 --- a/apps/rpm/serializers.py +++ b/apps/rpm/serializers.py @@ -16,6 +16,7 @@ from apps.utils.tools import check_id_number_e, check_phone_e from apps.wf.serializers import TicketSimpleSerializer from apps.rpm.services import rpj_member_come, rpj_certificate_in from apps.rpm.models import RpjLog +from django.conf import settings class RpartyCreateUpdateSerializer(CustomModelSerializer): @@ -145,7 +146,8 @@ class RemployeeCreateSerializer(CustomModelSerializer): if Remployee.objects.filter(id_number=validated_data['id_number'], rparty=validated_data['rparty']).exists(): raise ValidationError('该成员已存在') with transaction.atomic(): - dhClient.request(**dhapis['person_img_upload'], file_path_rela=validated_data['photo']) + if settings.DAHUA_ENABLED: + dhClient.request(**dhapis['person_img_upload'], file_path_rela=validated_data['photo']) return super().create(validated_data) @@ -157,7 +159,8 @@ class RemployeeUpdateSerializer(CustomModelSerializer): def update(self, instance, validated_data): with transaction.atomic(): - dhClient.request(**dhapis['person_img_upload'], file_path_rela=validated_data['photo']) + if settings.DAHUA_ENABLED: + dhClient.request(**dhapis['person_img_upload'], file_path_rela=validated_data['photo']) return super().update(instance, validated_data) class RemployeeSimpleSerializer(CustomModelSerializer): diff --git a/apps/rpm/views.py b/apps/rpm/views.py index ad76fbe0..f41c7920 100644 --- a/apps/rpm/views.py +++ b/apps/rpm/views.py @@ -236,6 +236,11 @@ class RpjmemberViewSet(CustomModelViewSet): 提前离厂 """ obj = self.get_object() + rpj = obj.rpj + if rpj.state != Rpj.RPJ_WORKING: + raise ParseError('成员非进行状态不可离厂') + obj.note = '提前离厂' + obj.save() rpj_member_leave(obj) RpjLog.objects.create(rpj=obj.rpj, operation='member_leave', remployee=obj.remployee, create_by=request.user, reason=request.data.get('reason', '')) return Response()