From 5a3c380dffbef0c7c62ee63ef018bb001e7c0090 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 14 Mar 2023 16:02:22 +0800 Subject: [PATCH] =?UTF-8?q?opl=20visit=20rpj=20=E6=B7=BB=E5=8A=A0ticket?= =?UTF-8?q?=E7=9A=84related=5Fname=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/opm/migrations/0010_alter_opl_ticket.py | 20 +++++++++++++++++++ apps/opm/models.py | 1 + apps/rpm/migrations/0006_alter_rpj_ticket.py | 20 +++++++++++++++++++ apps/rpm/models.py | 2 +- apps/vm/migrations/0007_alter_visit_ticket.py | 20 +++++++++++++++++++ apps/vm/models.py | 2 +- 6 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 apps/opm/migrations/0010_alter_opl_ticket.py create mode 100644 apps/rpm/migrations/0006_alter_rpj_ticket.py create mode 100644 apps/vm/migrations/0007_alter_visit_ticket.py diff --git a/apps/opm/migrations/0010_alter_opl_ticket.py b/apps/opm/migrations/0010_alter_opl_ticket.py new file mode 100644 index 00000000..7eaaad67 --- /dev/null +++ b/apps/opm/migrations/0010_alter_opl_ticket.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.12 on 2023-03-14 08:01 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wf', '0001_initial'), + ('opm', '0009_remove_oplcate_workflow'), + ] + + operations = [ + migrations.AlterField( + model_name='opl', + name='ticket', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='opl_ticket', to='wf.ticket', verbose_name='关联工单'), + ), + ] diff --git a/apps/opm/models.py b/apps/opm/models.py index dceb058a..b1e01829 100644 --- a/apps/opm/models.py +++ b/apps/opm/models.py @@ -115,6 +115,7 @@ class Opl(CommonBDModel): close_desc = models.TextField('作业关闭描述', null=True, blank=True) ticket = models.OneToOneField('wf.ticket', verbose_name='关联工单', on_delete=models.SET_NULL, + related_name='opl_ticket', null=True, blank=True) mtask_uid = models.CharField('监控任务ID', max_length=100, null=True, blank=True) diff --git a/apps/rpm/migrations/0006_alter_rpj_ticket.py b/apps/rpm/migrations/0006_alter_rpj_ticket.py new file mode 100644 index 00000000..37adbea0 --- /dev/null +++ b/apps/rpm/migrations/0006_alter_rpj_ticket.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.12 on 2023-03-14 08:01 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wf', '0001_initial'), + ('rpm', '0005_auto_20220825_1337'), + ] + + operations = [ + migrations.AlterField( + model_name='rpj', + name='ticket', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rpj_ticket', to='wf.ticket', verbose_name='关联工单'), + ), + ] diff --git a/apps/rpm/models.py b/apps/rpm/models.py index d72b39b4..7a5f27e4 100644 --- a/apps/rpm/models.py +++ b/apps/rpm/models.py @@ -68,7 +68,7 @@ class Rpj(CommonBDModel): remployees = models.ManyToManyField('rpm.remployee', through='rpm.rpjmember', related_name='rpj_remployees') # belong_dept是业务部门可以带过来 ticket = models.ForeignKey(Ticket, verbose_name='关联工单', - on_delete=models.SET_NULL, null=True, blank=True) + on_delete=models.SET_NULL, related_name='rpj_ticket', null=True, blank=True) class Rpjfile(BaseModel): diff --git a/apps/vm/migrations/0007_alter_visit_ticket.py b/apps/vm/migrations/0007_alter_visit_ticket.py new file mode 100644 index 00000000..81d9a8f5 --- /dev/null +++ b/apps/vm/migrations/0007_alter_visit_ticket.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.12 on 2023-03-14 08:01 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wf', '0001_initial'), + ('vm', '0006_visit_vehicle_photos'), + ] + + operations = [ + migrations.AlterField( + model_name='visit', + name='ticket', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='visit_ticket', to='wf.ticket', verbose_name='关联工单'), + ), + ] diff --git a/apps/vm/models.py b/apps/vm/models.py index 8114803c..0fb44877 100644 --- a/apps/vm/models.py +++ b/apps/vm/models.py @@ -50,7 +50,7 @@ class Visit(CommonBDModel): receptionist = models.ForeignKey(User, verbose_name='接待人', on_delete=models.CASCADE, null=True, blank=True) visitors = models.ManyToManyField('vm.visitor', through='vm.vpeople', related_name='v_visitors') ticket = models.ForeignKey(Ticket, verbose_name='关联工单', - on_delete=models.SET_NULL, null=True, blank=True) + on_delete=models.SET_NULL, related_name='visit_ticket', null=True, blank=True) # create_by 创建人