From 57da3eddb4a4a42c79b33f65e87cd0a7d1f4fe56 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 10 Mar 2023 17:08:45 +0800 Subject: [PATCH 1/2] myschedule migrations --- apps/system/migrations/0002_myschedule.py | 35 +++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 apps/system/migrations/0002_myschedule.py diff --git a/apps/system/migrations/0002_myschedule.py b/apps/system/migrations/0002_myschedule.py new file mode 100644 index 00000000..ab32b620 --- /dev/null +++ b/apps/system/migrations/0002_myschedule.py @@ -0,0 +1,35 @@ +# Generated by Django 3.2.12 on 2023-03-09 05:09 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('django_celery_beat', '0016_alter_crontabschedule_timezone'), + ('system', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='MySchedule', + fields=[ + ('id', models.CharField(editable=False, help_text='主键ID', max_length=20, primary_key=True, serialize=False, verbose_name='主键ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.CharField(max_length=200, verbose_name='名称')), + ('type', models.PositiveSmallIntegerField(default=10, verbose_name='周期类型')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='myschedule_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('crontab', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='django_celery_beat.crontabschedule')), + ('interval', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='django_celery_beat.intervalschedule')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='myschedule_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'abstract': False, + }, + ), + ] From 19167479477b814c6c8b34a16182b28ed7fe2dd5 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 10 Mar 2023 17:09:02 +0800 Subject: [PATCH 2/2] dpm migrations --- apps/dpm/migrations/0001_initial.py | 190 ++++++++++++++++++++++++++++ apps/dpm/migrations/0002_initial.py | 65 ++++++++++ 2 files changed, 255 insertions(+) create mode 100644 apps/dpm/migrations/0001_initial.py create mode 100644 apps/dpm/migrations/0002_initial.py diff --git a/apps/dpm/migrations/0001_initial.py b/apps/dpm/migrations/0001_initial.py new file mode 100644 index 00000000..395d9905 --- /dev/null +++ b/apps/dpm/migrations/0001_initial.py @@ -0,0 +1,190 @@ +# Generated by Django 3.2.12 on 2023-03-09 05:09 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('wf', '0001_initial'), + ('am', '0003_alter_area_access_list'), + ('system', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='CheckItem', + fields=[ + ('id', models.CharField(editable=False, help_text='主键ID', max_length=20, primary_key=True, serialize=False, verbose_name='主键ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('check_time', models.DateTimeField(blank=True, null=True, verbose_name='检查时间')), + ('result', models.PositiveSmallIntegerField(choices=[(10, '未检查'), (20, '合格'), (30, '不合格')], default=10, verbose_name='检查结果')), + ('note', models.TextField(blank=True, null=True, verbose_name='检查备注')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='CheckTaskSet', + fields=[ + ('id', models.CharField(editable=False, help_text='主键ID', max_length=20, primary_key=True, serialize=False, verbose_name='主键ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('note', models.TextField(blank=True, null=True, verbose_name='派发备注')), + ('expire', models.PositiveSmallIntegerField(default=0, help_text='0代表不设限制直到下个任务派发', verbose_name='执行有效期(h)')), + ('belong_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checktaskset_belong_dept', to='system.dept', verbose_name='所属部门')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checktaskset_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='CheckWork', + fields=[ + ('id', models.CharField(editable=False, help_text='主键ID', max_length=20, primary_key=True, serialize=False, verbose_name='主键ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.CharField(max_length=40, verbose_name='名称')), + ('description', models.TextField(blank=True, null=True, verbose_name='工作描述')), + ('type', models.PositiveSmallIntegerField(choices=[(10, '手动'), (20, '派发')], default=10, verbose_name='任务类型')), + ('time_start', models.DateTimeField(verbose_name='开启时间')), + ('time_end', models.DateTimeField(verbose_name='关闭时间')), + ('enabled', models.BooleanField(default=True, verbose_name='是否可用')), + ('note', models.TextField(blank=True, null=True, verbose_name='检查备注')), + ('time_check', models.BooleanField(default=True, verbose_name='最后检查时间')), + ('belong_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checkwork_belong_dept', to='system.dept', verbose_name='所属部门')), + ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='system.dictionary', verbose_name='工作分类')), + ('checktaskset', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dpm.checktaskset', verbose_name='关联派发任务')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checkwork_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='RiskPoint', + fields=[ + ('id', models.CharField(editable=False, help_text='主键ID', max_length=20, primary_key=True, serialize=False, verbose_name='主键ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.CharField(max_length=40, verbose_name='名称')), + ('place', models.CharField(blank=True, max_length=100, null=True, verbose_name='具体地点')), + ('level', models.PositiveSmallIntegerField(choices=[(10, '低风险'), (20, '一般风险'), (30, '较大风险'), (40, '重大风险')], default=10, verbose_name='风险点等级')), + ('type', models.PositiveSmallIntegerField(choices=[(10, '作业活动类'), (20, '设备设施类')], default=10, verbose_name='风险点类型')), + ('manage_level', models.PositiveSmallIntegerField(choices=[(10, '岗位级'), (20, '班组级'), (30, '部门级'), (40, '公司级')], default=10, verbose_name='管控层级')), + ('area', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskpoint_area', to='am.area', verbose_name='所在区域')), + ('belong_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='riskpoint_belong_dept', to='system.dept', verbose_name='所属部门')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='riskpoint_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('dept_res', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='riskpoint_dept_res', to='system.dept', verbose_name='责任部门')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='riskpoint_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ('user_res', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskpoint_user_res', to=settings.AUTH_USER_MODEL, verbose_name='责任人')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Risk', + fields=[ + ('id', models.CharField(editable=False, help_text='主键ID', max_length=20, primary_key=True, serialize=False, verbose_name='主键ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.TextField(verbose_name='项目/步骤')), + ('level', models.PositiveSmallIntegerField(choices=[(10, '低风险'), (20, '一般风险'), (30, '较大风险'), (40, '重大风险')], default=10, verbose_name='风险等级')), + ('standard', models.TextField(blank=True, null=True, verbose_name='检查标准')), + ('hazard', models.TextField(blank=True, null=True, verbose_name='危害因素')), + ('sort', models.PositiveSmallIntegerField(default=1, verbose_name='排序')), + ('measure_tech', models.TextField(blank=True, null=True, verbose_name='工程技术措施')), + ('measure_manage', models.TextField(blank=True, null=True, verbose_name='管理措施')), + ('measure_edu', models.TextField(blank=True, null=True, verbose_name='培训教育措施')), + ('measure_protect', models.TextField(blank=True, null=True, verbose_name='个体防护措施')), + ('measure_emer', models.TextField(blank=True, null=True, verbose_name='应急处置措施')), + ('riskl', models.DecimalField(blank=True, decimal_places=1, max_digits=6, null=True)), + ('riske', models.DecimalField(blank=True, decimal_places=1, max_digits=6, null=True)), + ('riskc', models.DecimalField(blank=True, decimal_places=1, max_digits=6, null=True)), + ('riskd', models.DecimalField(blank=True, decimal_places=1, max_digits=6, null=True)), + ('belong_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='risk_belong_dept', to='system.dept', verbose_name='所属部门')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='risk_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('results', models.ManyToManyField(blank=True, related_name='risk_results', to='system.Dictionary', verbose_name='可能后果')), + ('riskpoint', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dpm.riskpoint', verbose_name='所属风险点')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='risk_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Hazard', + fields=[ + ('id', models.CharField(editable=False, help_text='主键ID', max_length=20, primary_key=True, serialize=False, verbose_name='主键ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('number', models.CharField(blank=True, max_length=20, null=True, verbose_name='编号')), + ('state', models.PositiveSmallIntegerField(choices=[(10, '待提交'), (20, '流程中'), (30, '已结束')], default=10, verbose_name='隐患流程状态')), + ('time_discover', models.DateTimeField(verbose_name='发现时间')), + ('place', models.CharField(blank=True, max_length=100, null=True, verbose_name='具体地点')), + ('level', models.PositiveSmallIntegerField(choices=[(10, '无隐患'), (20, '一般隐患'), (30, '重大隐患')], default=10, verbose_name='隐患等级')), + ('harm_access', models.PositiveSmallIntegerField(choices=[(10, '无伤害'), (20, '轻微伤'), (30, '轻伤'), (40, '重伤'), (50, '死亡')], default=10, verbose_name='伤害评估')), + ('description', models.TextField(blank=True, null=True, verbose_name='隐患描述')), + ('reason', models.TextField(blank=True, null=True, verbose_name='原因分析')), + ('correct_measure', models.TextField(blank=True, null=True, verbose_name='整改措施')), + ('correct_deadline', models.DateTimeField(blank=True, null=True, verbose_name='整改期限')), + ('correct_description', models.TextField(blank=True, null=True, verbose_name='整改描述')), + ('correct_time', models.DateTimeField(blank=True, null=True, verbose_name='整改完成时间')), + ('opinion_access', models.TextField(blank=True, null=True, verbose_name='评估意见')), + ('opinion_check', models.TextField(blank=True, null=True, verbose_name='复查意见')), + ('opinion_audit', models.TextField(blank=True, null=True, verbose_name='审核意见')), + ('area', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='am.area', verbose_name='所在区域')), + ('belong_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='hazard_belong_dept', to='system.dept', verbose_name='所属部门')), + ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='system.dictionary', verbose_name='隐患类别')), + ('checkitem', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dpm.checkitem', verbose_name='关联检查条目')), + ('checkwork', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dpm.checkwork', verbose_name='关联检查工作')), + ('correct_solution', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='system.file', verbose_name='整改方案')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='hazard_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('dept_correct', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='hazard_dept_correct', to='system.dept', verbose_name='整改部门')), + ('dept_res', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='hazard_dept_res', to='system.dept', verbose_name='责任部门')), + ('photos', models.ManyToManyField(blank=True, related_name='hazard_photos', to='system.File', verbose_name='现场照片')), + ('photos_done', models.ManyToManyField(blank=True, related_name='hazard_photos_done', to='system.File', verbose_name='整改后照片')), + ('ticket', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='hazard_ticket', to='wf.ticket', verbose_name='关联工单')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='hazard_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ('user_access', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hazard_user_access', to=settings.AUTH_USER_MODEL, verbose_name='评估人')), + ('user_audit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hazard_user_audit', to=settings.AUTH_USER_MODEL, verbose_name='审核人')), + ('user_check', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hazard_user_check', to=settings.AUTH_USER_MODEL, verbose_name='复查人')), + ('user_correct', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='hazard_user_correct', to=settings.AUTH_USER_MODEL, verbose_name='整改责任人')), + ('user_discover', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hazard_user_discover', to=settings.AUTH_USER_MODEL, verbose_name='发现人')), + ], + options={ + 'abstract': False, + }, + ), + migrations.AddField( + model_name='checkwork', + name='riskpoint', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='cwork_riskpoint', to='dpm.riskpoint', verbose_name='关联风险点'), + ), + migrations.AddField( + model_name='checkwork', + name='update_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checkwork_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'), + ), + migrations.AddField( + model_name='checkwork', + name='user_duty', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='指派人'), + ), + ] diff --git a/apps/dpm/migrations/0002_initial.py b/apps/dpm/migrations/0002_initial.py new file mode 100644 index 00000000..ed1b4f8a --- /dev/null +++ b/apps/dpm/migrations/0002_initial.py @@ -0,0 +1,65 @@ +# Generated by Django 3.2.12 on 2023-03-09 05:09 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('dpm', '0001_initial'), + ('system', '0002_myschedule'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('django_celery_beat', '0016_alter_crontabschedule_timezone'), + ] + + operations = [ + migrations.AddField( + model_name='checktaskset', + name='myschedule', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='system.myschedule', verbose_name='周期'), + ), + migrations.AddField( + model_name='checktaskset', + name='periodictask', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checktask_periodictask', to='django_celery_beat.periodictask', verbose_name='关联定时任务'), + ), + migrations.AddField( + model_name='checktaskset', + name='riskpoint', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ctask_riskpoint', to='dpm.riskpoint', verbose_name='关联风险点'), + ), + migrations.AddField( + model_name='checktaskset', + name='update_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checktaskset_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'), + ), + migrations.AddField( + model_name='checktaskset', + name='user_duty', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='指派人'), + ), + migrations.AddField( + model_name='checkitem', + name='checkwork', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='citem_checkwork', to='dpm.checkwork', verbose_name='关联检查工作'), + ), + migrations.AddField( + model_name='checkitem', + name='create_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checkitem_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'), + ), + migrations.AddField( + model_name='checkitem', + name='risk', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='citem_risk', to='dpm.risk', verbose_name='关联风险'), + ), + migrations.AddField( + model_name='checkitem', + name='update_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checkitem_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'), + ), + ]