zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 成员离厂有限制/大华启用才校验图片接口

This commit is contained in:
caoqianming 2023-03-24 15:31:20 +08:00
parent 068474f4e6
commit 9d7739ae59
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/rpm/serializers.py
View File

@ -16,6 +16,7 @@ from apps.utils.tools import check_id_number_e, check_phone_e
from apps.wf.serializers import TicketSimpleSerializer from apps.wf.serializers import TicketSimpleSerializer
from apps.rpm.services import rpj_member_come, rpj_certificate_in from apps.rpm.services import rpj_member_come, rpj_certificate_in
from apps.rpm.models import RpjLog from apps.rpm.models import RpjLog
from django.conf import settings
class RpartyCreateUpdateSerializer(CustomModelSerializer): 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(): if Remployee.objects.filter(id_number=validated_data['id_number'], rparty=validated_data['rparty']).exists():
raise ValidationError('该成员已存在') raise ValidationError('该成员已存在')
with transaction.atomic(): 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) return super().create(validated_data)
@ -157,7 +159,8 @@ class RemployeeUpdateSerializer(CustomModelSerializer):
def update(self, instance, validated_data): def update(self, instance, validated_data):
with transaction.atomic(): 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) return super().update(instance, validated_data)
class RemployeeSimpleSerializer(CustomModelSerializer): class RemployeeSimpleSerializer(CustomModelSerializer):

5
apps/rpm/views.py
View File

@ -236,6 +236,11 @@ class RpjmemberViewSet(CustomModelViewSet):
提前离厂 提前离厂
""" """
obj = self.get_object() obj = self.get_object()
rpj = obj.rpj
if rpj.state != Rpj.RPJ_WORKING:
raise ParseError('成员非进行状态不可离厂')
obj.note = '提前离厂'
obj.save()
rpj_member_leave(obj) 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', '')) RpjLog.objects.create(rpj=obj.rpj, operation='member_leave', remployee=obj.remployee, create_by=request.user, reason=request.data.get('reason', ''))
return Response() return Response()