From e6933f9fc4990d290ea4913333f3f8e49fc55975 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 27 Apr 2023 11:31:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20rpjmember=20update=20rpj=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/rpm/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/rpm/serializers.py b/apps/rpm/serializers.py index dfed379c..4cb62752 100644 --- a/apps/rpm/serializers.py +++ b/apps/rpm/serializers.py @@ -272,7 +272,7 @@ class RpjmemberUpdateSerializer(CustomModelSerializer): fields = ['duty', 'is_manager', 'rcertificates'] def update(self, instance, validated_data): - rpj = validated_data['rpj'] + rpj = instance.rpj if rpj.state in [Rpj.RPJ_DONE, Rpj.RPJ_CLOSE]: raise ParseError('该项目状态成员不可修改') rcertificates = validated_data.pop('rcertificates') From c2c05a50752626a700e62ef44ef37296cab7549a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 27 Apr 2023 14:42:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20opl=20level=E5=8F=AF=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/opm/admin.py | 3 ++- apps/opm/migrations/0012_alter_opl_level.py | 18 ++++++++++++++++++ apps/opm/models.py | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 apps/opm/migrations/0012_alter_opl_level.py diff --git a/apps/opm/admin.py b/apps/opm/admin.py index 8c38f3f3..c5f26dc5 100644 --- a/apps/opm/admin.py +++ b/apps/opm/admin.py @@ -1,3 +1,4 @@ from django.contrib import admin - +from .models import Opl # Register your models here. +admin.site.register(Opl) \ No newline at end of file diff --git a/apps/opm/migrations/0012_alter_opl_level.py b/apps/opm/migrations/0012_alter_opl_level.py new file mode 100644 index 00000000..97d04205 --- /dev/null +++ b/apps/opm/migrations/0012_alter_opl_level.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2023-04-27 06:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('opm', '0011_alter_opl_level'), + ] + + operations = [ + migrations.AlterField( + model_name='opl', + name='level', + field=models.CharField(blank=True, help_text='特技/三级/二级/主干道/次干道', max_length=20, null=True, verbose_name='作业级别'), + ), + ] diff --git a/apps/opm/models.py b/apps/opm/models.py index 2ca62208..3fd646ca 100644 --- a/apps/opm/models.py +++ b/apps/opm/models.py @@ -74,7 +74,7 @@ class Opl(CommonBDModel): number = models.CharField('作业许可编号', max_length=20, null=True, blank=True) work_scope = models.CharField('作业范围', max_length=200, null=True, blank=True) level = models.CharField('作业级别', max_length=20, - help_text='特技/三级/二级/主干道/次干道', default='') + help_text='特技/三级/二级/主干道/次干道', null=True, blank=True) cate = models.ForeignKey(OplCate, verbose_name='作业许可种类', on_delete=models.CASCADE) start_time = models.DateTimeField('作业开始时间', null=True, blank=True) From 923e8128907b8dd723d6c4ebe254aa3331d9e64c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 27 Apr 2023 14:43:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20ep=20update=20=E4=B8=8D=E6=94=BE?= =?UTF-8?q?=E5=9C=A8=E4=BA=8B=E5=8A=A1=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/hrm/serializers.py | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/hrm/serializers.py b/apps/hrm/serializers.py index 9552f031..3f374e15 100755 --- a/apps/hrm/serializers.py +++ b/apps/hrm/serializers.py @@ -61,7 +61,6 @@ class EmployeeCreateUpdateSerializer(CustomModelSerializer): HrmService.sync_dahua_employee(ep=instance) return instance - @transaction.atomic def update(self, instance, validated_data): id_number = validated_data['id_number'] ret = get_info_from_id(id_number)