From 80a8bd19c7ea35e782d468d5c0d61cd094d97f64 Mon Sep 17 00:00:00 2001 From: zty Date: Fri, 28 Jun 2024 17:32:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:information=20view.py=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0056_auto_20240628_1338.py | 25 +++++++++++++++++++ .../migrations/0057_auto_20240628_1422.py | 25 +++++++++++++++++++ server/apps/information/models.py | 2 ++ server/apps/information/views.py | 6 +++-- 4 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 server/apps/information/migrations/0056_auto_20240628_1338.py create mode 100644 server/apps/information/migrations/0057_auto_20240628_1422.py diff --git a/server/apps/information/migrations/0056_auto_20240628_1338.py b/server/apps/information/migrations/0056_auto_20240628_1338.py new file mode 100644 index 0000000..574e258 --- /dev/null +++ b/server/apps/information/migrations/0056_auto_20240628_1338.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.12 on 2024-06-28 05:38 + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('information', '0055_alter_qualification_change_date'), + ] + + operations = [ + migrations.AddField( + model_name='qualityactivities', + name='file', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='相关文件'), + ), + migrations.AlterField( + model_name='qualification', + name='change_date', + field=models.DateField(blank=True, default=datetime.datetime(2024, 6, 28, 5, 38, 26, 261125, tzinfo=utc), null=True, verbose_name='变更日期'), + ), + ] diff --git a/server/apps/information/migrations/0057_auto_20240628_1422.py b/server/apps/information/migrations/0057_auto_20240628_1422.py new file mode 100644 index 0000000..7ae2713 --- /dev/null +++ b/server/apps/information/migrations/0057_auto_20240628_1422.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.12 on 2024-06-28 06:22 + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('information', '0056_auto_20240628_1338'), + ] + + operations = [ + migrations.AddField( + model_name='qualitycommendation', + name='file', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='相关文件'), + ), + migrations.AlterField( + model_name='qualification', + name='change_date', + field=models.DateField(blank=True, default=datetime.datetime(2024, 6, 28, 6, 21, 59, 784546, tzinfo=utc), null=True, verbose_name='变更日期'), + ), + ] diff --git a/server/apps/information/models.py b/server/apps/information/models.py index 1742a4b..70de678 100644 --- a/server/apps/information/models.py +++ b/server/apps/information/models.py @@ -70,6 +70,7 @@ class QualityCommendation(CommonBDModel): awardee_people = models.CharField(max_length=20, verbose_name='获奖人', null=True, blank=True) awarded_by = models.CharField(max_length=20, verbose_name='颁奖单位') awarded_date = models.DateField(verbose_name='获奖日期', null=True) + file = models.CharField(max_length=100, verbose_name='相关文件', null=True, blank=True) class Meta: verbose_name = '质量表彰' @@ -86,6 +87,7 @@ class QualityActivities(CommonBDModel): participations = models.IntegerField(verbose_name='活动参与单位数量', null=True, blank=True) function = models.CharField(max_length=100, verbose_name='活动中发挥的作用', null=True) earnings = models.FloatField(verbose_name='活动收益', null=True) + file = models.CharField(max_length=100, verbose_name='相关文件', null=True, blank=True) class Meta: verbose_name = '质量活动' diff --git a/server/apps/information/views.py b/server/apps/information/views.py index 89bf91a..72f3fc0 100644 --- a/server/apps/information/views.py +++ b/server/apps/information/views.py @@ -235,7 +235,8 @@ class QualityCommendationViewSet(ImpMixin, RbacFilterSet, CreateUpdateCustomMixi "awardee_company": "获奖单位", "awardee_people": "获奖人", "awarded_by":"颁奖单位", - "review_date": "获奖日期" + "review_date": "获奖日期", + "file": "附件", } new_data_list = [] for i in range(len(data_list)): @@ -268,7 +269,8 @@ class QualityActivitiesViewSet(ImpMixin, RbacFilterSet, CreateUpdateCustomMixin, "activate_time":"活动时间", "participations": "活动参与单位数量", "function": "活动中发挥的作用", - "earnings":"活动收益(元)" + "earnings":"活动收益(元)" , + "file": "附件", } role_map ={0:"组织方", 1:"参与方"} new_data_list = []