From acdaddc343bce7a22b841307b04c511a97466ab8 Mon Sep 17 00:00:00 2001 From: zty Date: Wed, 17 Jul 2024 14:08:21 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0016_auto_20240717_1353.py | 42 ++++++++++++ .../0017_device_infras_percentage.py | 18 +++++ server/apps/consulting/models.py | 12 ++-- .../migrations/0060_auto_20240710_1408.py | 25 +++++++ .../migrations/0061_auto_20240711_1048.py | 25 +++++++ .../migrations/0062_auto_20240711_1049.py | 30 +++++++++ .../migrations/0063_auto_20240712_1353.py | 50 ++++++++++++++ .../migrations/0064_auto_20240712_1523.py | 65 +++++++++++++++++++ 8 files changed, 261 insertions(+), 6 deletions(-) create mode 100644 server/apps/consulting/migrations/0016_auto_20240717_1353.py create mode 100644 server/apps/consulting/migrations/0017_device_infras_percentage.py create mode 100644 server/apps/information/migrations/0060_auto_20240710_1408.py create mode 100644 server/apps/information/migrations/0061_auto_20240711_1048.py create mode 100644 server/apps/information/migrations/0062_auto_20240711_1049.py create mode 100644 server/apps/information/migrations/0063_auto_20240712_1353.py create mode 100644 server/apps/information/migrations/0064_auto_20240712_1523.py diff --git a/server/apps/consulting/migrations/0016_auto_20240717_1353.py b/server/apps/consulting/migrations/0016_auto_20240717_1353.py new file mode 100644 index 0000000..23f8993 --- /dev/null +++ b/server/apps/consulting/migrations/0016_auto_20240717_1353.py @@ -0,0 +1,42 @@ +# Generated by Django 3.2.12 on 2024-07-17 05:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('consulting', '0015_alter_device_id'), + ] + + operations = [ + migrations.RemoveField( + model_name='device', + name='infras_percentage', + ), + migrations.AlterField( + model_name='device', + name='company_name', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='公司名称'), + ), + migrations.AlterField( + model_name='device', + name='company_number', + field=models.IntegerField(blank=True, default=0, null=True, verbose_name='公司序号'), + ), + migrations.AlterField( + model_name='device', + name='device_name', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='设备名称'), + ), + migrations.AlterField( + model_name='device', + name='is_infrastructure', + field=models.BooleanField(blank=True, default=False, null=True, verbose_name='原值是否含基建'), + ), + migrations.AlterField( + model_name='device', + name='is_instructions', + field=models.BooleanField(blank=True, default=False, null=True, verbose_name='是否有说明书'), + ), + ] diff --git a/server/apps/consulting/migrations/0017_device_infras_percentage.py b/server/apps/consulting/migrations/0017_device_infras_percentage.py new file mode 100644 index 0000000..770d8cc --- /dev/null +++ b/server/apps/consulting/migrations/0017_device_infras_percentage.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2024-07-17 06:06 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('consulting', '0016_auto_20240717_1353'), + ] + + operations = [ + migrations.AddField( + model_name='device', + name='infras_percentage', + field=models.FloatField(blank=True, default=0, null=True, verbose_name='基建原值占比'), + ), + ] diff --git a/server/apps/consulting/models.py b/server/apps/consulting/models.py index 3a2b60a..f8719a9 100644 --- a/server/apps/consulting/models.py +++ b/server/apps/consulting/models.py @@ -74,9 +74,9 @@ class Validation(CommonAModel): class Device(CommonADModel): id = models.AutoField(primary_key=True) - company_number = models.IntegerField('公司序号', default=0) - company_name = models.CharField('公司名称', max_length=100) - device_name = models.CharField('设备名称', max_length=100) + company_number = models.IntegerField('公司序号', default=0, null=True, blank=True) + company_name = models.CharField('公司名称', max_length=100, null=True, blank=True) + device_name = models.CharField('设备名称', max_length=100, null=True, blank=True) device_number = models.CharField('设备编号', max_length=500, null=True, blank=True) spec = models.CharField('规格型号', max_length=500, null=True, blank=True) manufactor = models.CharField('生产厂家', max_length=500, null=True, blank=True) @@ -88,9 +88,9 @@ class Device(CommonADModel): procurement_time = models.CharField('采购时间', max_length=50, null=True, blank=True) original_price = models.CharField('资产原值', max_length=50, null=True, blank=True) current_price = models.CharField('资产净值', max_length=50, null=True, blank=True) - is_infrastructure = models.BooleanField('原值是否含基建', default=False) - infras_percentage = models.FloatField('基建原值占比', default=0) - is_instructions = models.BooleanField('是否有说明书', default=False) + is_infrastructure = models.BooleanField('原值是否含基建', default=False, null=True, blank=True) + infras_percentage = models.FloatField('基建原值占比', default=0, null=True, blank=True) + is_instructions = models.BooleanField('是否有说明书', default=False, null=True, blank=True) custodian = models.CharField('保管人', max_length=20, null=True, blank=True) depositor = models.CharField('存放地点', max_length=20, null=True, blank=True) contacts = models.CharField('设备联系人', max_length=20, null=True, blank=True) diff --git a/server/apps/information/migrations/0060_auto_20240710_1408.py b/server/apps/information/migrations/0060_auto_20240710_1408.py new file mode 100644 index 0000000..a284ad2 --- /dev/null +++ b/server/apps/information/migrations/0060_auto_20240710_1408.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.12 on 2024-07-10 06:08 + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('information', '0059_auto_20240708_1306'), + ] + + operations = [ + migrations.AddField( + model_name='abilityreview', + name='quali_type', + field=models.PositiveSmallIntegerField(choices=[(0, '国家级'), (1, '省级'), (2, '行业资质'), (3, '认可资质')], max_length=20, null=True, verbose_name='资质类型'), + ), + migrations.AlterField( + model_name='qualification', + name='change_date', + field=models.DateField(blank=True, default=datetime.datetime(2024, 7, 10, 6, 8, 8, 84587, tzinfo=utc), null=True, verbose_name='变更日期'), + ), + ] diff --git a/server/apps/information/migrations/0061_auto_20240711_1048.py b/server/apps/information/migrations/0061_auto_20240711_1048.py new file mode 100644 index 0000000..fe816b5 --- /dev/null +++ b/server/apps/information/migrations/0061_auto_20240711_1048.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.12 on 2024-07-11 02:48 + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('information', '0060_auto_20240710_1408'), + ] + + operations = [ + migrations.AlterField( + model_name='externalauditors', + name='name_company', + field=models.CharField(max_length=20, verbose_name='公司名称'), + ), + migrations.AlterField( + model_name='qualification', + name='change_date', + field=models.DateField(blank=True, default=datetime.datetime(2024, 7, 11, 2, 47, 50, 567734, tzinfo=utc), null=True, verbose_name='变更日期'), + ), + ] diff --git a/server/apps/information/migrations/0062_auto_20240711_1049.py b/server/apps/information/migrations/0062_auto_20240711_1049.py new file mode 100644 index 0000000..5118d3a --- /dev/null +++ b/server/apps/information/migrations/0062_auto_20240711_1049.py @@ -0,0 +1,30 @@ +# Generated by Django 3.2.12 on 2024-07-11 02:49 + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('information', '0061_auto_20240711_1048'), + ] + + operations = [ + migrations.AlterField( + model_name='qualification', + name='change_date', + field=models.DateField(blank=True, default=datetime.datetime(2024, 7, 11, 2, 49, 12, 529857, tzinfo=utc), null=True, verbose_name='变更日期'), + ), + migrations.AlterField( + model_name='qualityactivities', + name='name', + field=models.CharField(max_length=20, verbose_name='活动名称'), + ), + migrations.AlterField( + model_name='qualitycommendation', + name='name', + field=models.CharField(max_length=20, verbose_name='项目名称'), + ), + ] diff --git a/server/apps/information/migrations/0063_auto_20240712_1353.py b/server/apps/information/migrations/0063_auto_20240712_1353.py new file mode 100644 index 0000000..ee483aa --- /dev/null +++ b/server/apps/information/migrations/0063_auto_20240712_1353.py @@ -0,0 +1,50 @@ +# Generated by Django 3.2.12 on 2024-07-12 05:53 + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('information', '0062_auto_20240711_1049'), + ] + + operations = [ + migrations.AlterField( + model_name='qualification', + name='change_date', + field=models.DateField(blank=True, default=datetime.datetime(2024, 7, 12, 5, 53, 31, 584648, tzinfo=utc), null=True, verbose_name='变更日期'), + ), + migrations.AlterField( + model_name='qualitycommendation', + name='Awards_level', + field=models.CharField(max_length=50, verbose_name='获奖等级'), + ), + migrations.AlterField( + model_name='qualitycommendation', + name='awarded_by', + field=models.CharField(max_length=50, verbose_name='颁奖单位'), + ), + migrations.AlterField( + model_name='qualitycommendation', + name='awardee_company', + field=models.CharField(blank=True, max_length=50, null=True, verbose_name='获奖单位'), + ), + migrations.AlterField( + model_name='qualitycommendation', + name='awardee_people', + field=models.CharField(blank=True, max_length=50, null=True, verbose_name='获奖人'), + ), + migrations.AlterField( + model_name='qualitycommendation', + name='commendation_name', + field=models.CharField(max_length=50, verbose_name='表彰名称'), + ), + migrations.AlterField( + model_name='qualitycommendation', + name='name', + field=models.CharField(max_length=50, verbose_name='项目名称'), + ), + ] diff --git a/server/apps/information/migrations/0064_auto_20240712_1523.py b/server/apps/information/migrations/0064_auto_20240712_1523.py new file mode 100644 index 0000000..3cf4c0f --- /dev/null +++ b/server/apps/information/migrations/0064_auto_20240712_1523.py @@ -0,0 +1,65 @@ +# Generated by Django 3.2.12 on 2024-07-12 07:23 + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('information', '0063_auto_20240712_1353'), + ] + + operations = [ + migrations.AlterField( + model_name='contact', + name='email', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='负责人邮箱'), + ), + migrations.AlterField( + model_name='contact', + name='email_quality', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='质量负责人邮箱'), + ), + migrations.AlterField( + model_name='contact', + name='email_technology', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='技术负责人邮箱'), + ), + migrations.AlterField( + model_name='contact', + name='head_quality', + field=models.CharField(max_length=100, verbose_name='质量负责人'), + ), + migrations.AlterField( + model_name='contact', + name='head_technology', + field=models.CharField(max_length=100, verbose_name='技术负责人'), + ), + migrations.AlterField( + model_name='contact', + name='header', + field=models.CharField(max_length=100, verbose_name='负责人'), + ), + migrations.AlterField( + model_name='contact', + name='tel', + field=models.CharField(max_length=100, verbose_name='负责人电话'), + ), + migrations.AlterField( + model_name='contact', + name='tel_quality', + field=models.CharField(max_length=100, verbose_name='质量负责人电话'), + ), + migrations.AlterField( + model_name='contact', + name='tel_technology', + field=models.CharField(max_length=100, verbose_name='技术负责人电话'), + ), + migrations.AlterField( + model_name='qualification', + name='change_date', + field=models.DateField(blank=True, default=datetime.datetime(2024, 7, 12, 7, 23, 52, 901985, tzinfo=utc), null=True, verbose_name='变更日期'), + ), + ]