Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server

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)

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)

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='作业级别'),
+        ),
+    ]

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)

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')