From 45e95ad014f2105fb570f5de69b281affecff667 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 29 May 2023 12:07:07 +0800 Subject: [PATCH] =?UTF-8?q?refector:=20=E5=90=8C=E6=AD=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/migrations/0045_rc_remark.py | 18 +++++++++ .../migrations/0046_auto_20230529_1206.py | 38 +++++++++++++++++++ server/apps/supervision/models.py | 16 ++++++-- 3 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 server/apps/supervision/migrations/0045_rc_remark.py create mode 100644 server/apps/supervision/migrations/0046_auto_20230529_1206.py diff --git a/server/apps/supervision/migrations/0045_rc_remark.py b/server/apps/supervision/migrations/0045_rc_remark.py new file mode 100644 index 0000000..829d9ca --- /dev/null +++ b/server/apps/supervision/migrations/0045_rc_remark.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2023-05-29 01:39 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('supervision', '0044_rename_num_ocheck_task2do_num_oinspect'), + ] + + operations = [ + migrations.AddField( + model_name='rc', + name='remark', + field=models.TextField(blank=True, null=True, verbose_name='备注'), + ), + ] diff --git a/server/apps/supervision/migrations/0046_auto_20230529_1206.py b/server/apps/supervision/migrations/0046_auto_20230529_1206.py new file mode 100644 index 0000000..b4480af --- /dev/null +++ b/server/apps/supervision/migrations/0046_auto_20230529_1206.py @@ -0,0 +1,38 @@ +# Generated by Django 3.2.12 on 2023-05-29 04:06 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('supervision', '0045_rc_remark'), + ] + + operations = [ + migrations.AddField( + model_name='pt', + name='handle_result', + field=models.PositiveSmallIntegerField(choices=[(0, '/'), (10, '已整改'), (20, '被暂停'), (30, '已被撤销认可资格')], default=0, help_text="((0, '/'), (10, '已整改'), (20, '被暂停'), (30, '已被撤销认可资格'))", verbose_name='处理结果'), + ), + migrations.AlterField( + model_name='oinspect', + name='cate', + field=models.PositiveSmallIntegerField(choices=[(10, '市场监管部门检查'), (20, '行业主管部门检查'), (30, '其他检查')], default=30, help_text="((10, '市场监管部门检查'), (20, '行业主管部门检查'), (30, '其他检查'))", verbose_name='检查分类'), + ), + migrations.AlterField( + model_name='pt', + name='result', + field=models.PositiveSmallIntegerField(choices=[(10, '满意'), (20, '有问题'), (30, '不满意')], default=10, help_text="((10, '满意'), (20, '有问题'), (30, '不满意'))", verbose_name='结果'), + ), + migrations.AlterField( + model_name='risk', + name='level', + field=models.PositiveSmallIntegerField(choices=[(10, '主要风险'), (20, '严重风险'), (30, '重大风险')], default=10, help_text="((10, '主要风险'), (20, '严重风险'), (30, '重大风险'))", verbose_name='风险等级'), + ), + migrations.AlterField( + model_name='risk', + name='state', + field=models.PositiveSmallIntegerField(choices=[(10, '未整改'), (20, '整改中'), (30, '整改完成')], default=10, help_text="((10, '未整改'), (20, '整改中'), (30, '整改完成'))", verbose_name='整改状态'), + ), + ] diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py index 9849a66..55270ad 100644 --- a/server/apps/supervision/models.py +++ b/server/apps/supervision/models.py @@ -211,6 +211,7 @@ class Rc(CommonBModel): date_expect = models.DateField('预计发放日期', null=True, blank=True) date_issue = models.DateField('实际发放日期', null=True, blank=True) task2do = models.ForeignKey('supervision.task2do', verbose_name= '关联任务执行', on_delete=models.SET_NULL, null=True, blank=True) + remark = models.TextField('备注', null=True, blank=True) class Complaint(CommonBModel): @@ -232,11 +233,18 @@ class Pt(CommonBModel): (20, '有问题'), (30, '不满意') ) + pt_hresult_choices = ( + (0, '/'), + (10, '已整改'), + (20, '被暂停'), + (30, '已被撤销认可资格') + ) name = models.CharField('名称', max_length=100) number = models.CharField('编号', max_length=100) organizer = models.CharField('组织方', max_length=100) params = models.TextField('参加参数名称') - result = models.PositiveSmallIntegerField('结果', choices=pt_result_choices, default=10) + result = models.PositiveSmallIntegerField('结果', choices=pt_result_choices, default=10, help_text=str(pt_result_choices)) + handle_result = models.PositiveSmallIntegerField('处理结果', choices = pt_hresult_choices, default=0, help_text=str(pt_hresult_choices)) task2do = models.ForeignKey('supervision.task2do', verbose_name= '关联任务执行', on_delete=models.SET_NULL, null=True, blank=True) @@ -254,9 +262,9 @@ class Risk(CommonBModel): (30, '整改完成') ) content = models.TextField('内容') - level = models.PositiveSmallIntegerField('风险等级', choices=risk_level_choices, default=10) + level = models.PositiveSmallIntegerField('风险等级', choices=risk_level_choices, default=10, help_text=str(risk_level_choices)) code = models.CharField('风险代码', max_length=100) - state = models.PositiveSmallIntegerField('整改状态', choices=risk_state_choices, default=10) + state = models.PositiveSmallIntegerField('整改状态', choices=risk_state_choices, default=10, help_text=str(risk_state_choices)) task2do = models.ForeignKey('supervision.task2do', verbose_name= '关联任务执行', on_delete=models.SET_NULL, null=True, blank=True) @@ -268,7 +276,7 @@ class Oinspect(CommonBModel): (20, '行业主管部门检查'), (30, '其他检查') ) - cate = models.PositiveSmallIntegerField('检查分类', choices=oinspect_cate_choices, default=30) + cate = models.PositiveSmallIntegerField('检查分类', choices=oinspect_cate_choices, default=30, help_text=str(oinspect_cate_choices)) checker = models.CharField('检查方', max_length=100) date_inspect = models.DateField('检查日期') result = models.TextField('检查结果')