From ea995eb8ca13f7a27fb8106dac9b294367c7d2a6 Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Thu, 9 Sep 2021 10:35:48 +0800 Subject: [PATCH] fankui --- .../migrations/0024_taskdept_files.py | 19 +++++++++++ .../migrations/0025_taskdept_is_yes.py | 18 +++++++++++ .../migrations/0026_auto_20210908_1611.py | 24 ++++++++++++++ .../migrations/0027_auto_20210908_1636.py | 19 +++++++++++ .../migrations/0028_remove_taskdept_files.py | 17 ++++++++++ server/apps/supervision/models.py | 4 ++- server/apps/supervision/serializers.py | 1 - server/apps/supervision/views.py | 3 +- .../vod/migrations/0004_auto_20210908_1449.py | 19 +++++++++++ server/server/settings_dev.py | 32 +++++++++---------- 10 files changed, 137 insertions(+), 19 deletions(-) create mode 100644 server/apps/supervision/migrations/0024_taskdept_files.py create mode 100644 server/apps/supervision/migrations/0025_taskdept_is_yes.py create mode 100644 server/apps/supervision/migrations/0026_auto_20210908_1611.py create mode 100644 server/apps/supervision/migrations/0027_auto_20210908_1636.py create mode 100644 server/apps/supervision/migrations/0028_remove_taskdept_files.py create mode 100644 server/apps/vod/migrations/0004_auto_20210908_1449.py diff --git a/server/apps/supervision/migrations/0024_taskdept_files.py b/server/apps/supervision/migrations/0024_taskdept_files.py new file mode 100644 index 0000000..e576820 --- /dev/null +++ b/server/apps/supervision/migrations/0024_taskdept_files.py @@ -0,0 +1,19 @@ +# Generated by Django 3.0.5 on 2021-09-08 06:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('system', '0018_auto_20210430_1156'), + ('supervision', '0023_auto_20210824_1112'), + ] + + operations = [ + migrations.AddField( + model_name='taskdept', + name='files', + field=models.ManyToManyField(to='system.File', verbose_name='反馈文件'), + ), + ] diff --git a/server/apps/supervision/migrations/0025_taskdept_is_yes.py b/server/apps/supervision/migrations/0025_taskdept_is_yes.py new file mode 100644 index 0000000..1614420 --- /dev/null +++ b/server/apps/supervision/migrations/0025_taskdept_is_yes.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.5 on 2021-09-08 07:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('supervision', '0024_taskdept_files'), + ] + + operations = [ + migrations.AddField( + model_name='taskdept', + name='is_yes', + field=models.BooleanField(default=False, verbose_name='是否反馈'), + ), + ] diff --git a/server/apps/supervision/migrations/0026_auto_20210908_1611.py b/server/apps/supervision/migrations/0026_auto_20210908_1611.py new file mode 100644 index 0000000..96dbea8 --- /dev/null +++ b/server/apps/supervision/migrations/0026_auto_20210908_1611.py @@ -0,0 +1,24 @@ +# Generated by Django 3.0.5 on 2021-09-08 08:11 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('system', '0018_auto_20210430_1156'), + ('supervision', '0025_taskdept_is_yes'), + ] + + operations = [ + migrations.AddField( + model_name='taskdept', + name='file', + field=models.CharField(blank=True, max_length=200, null=True, verbose_name='反馈文件'), + ), + migrations.AlterField( + model_name='taskdept', + name='files', + field=models.ManyToManyField(to='system.File', verbose_name='反馈'), + ), + ] diff --git a/server/apps/supervision/migrations/0027_auto_20210908_1636.py b/server/apps/supervision/migrations/0027_auto_20210908_1636.py new file mode 100644 index 0000000..bae4adc --- /dev/null +++ b/server/apps/supervision/migrations/0027_auto_20210908_1636.py @@ -0,0 +1,19 @@ +# Generated by Django 3.0.5 on 2021-09-08 08:36 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('system', '0018_auto_20210430_1156'), + ('supervision', '0026_auto_20210908_1611'), + ] + + operations = [ + migrations.AlterField( + model_name='taskdept', + name='files', + field=models.ManyToManyField(blank=True, null=True, to='system.File', verbose_name='反馈'), + ), + ] diff --git a/server/apps/supervision/migrations/0028_remove_taskdept_files.py b/server/apps/supervision/migrations/0028_remove_taskdept_files.py new file mode 100644 index 0000000..797c41b --- /dev/null +++ b/server/apps/supervision/migrations/0028_remove_taskdept_files.py @@ -0,0 +1,17 @@ +# Generated by Django 3.0.5 on 2021-09-09 02:34 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('supervision', '0027_auto_20210908_1636'), + ] + + operations = [ + migrations.RemoveField( + model_name='taskdept', + name='files', + ), + ] diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py index 6beefb2..56ce6f7 100644 --- a/server/apps/supervision/models.py +++ b/server/apps/supervision/models.py @@ -49,7 +49,9 @@ class TaskDept(BaseModel): dept = models.ForeignKey(Organization, verbose_name='关联公司', on_delete=models.CASCADE, related_name='taskdept_dept') up_rate = models.IntegerField('报送率', default=0) confirm_rate = models.IntegerField('确认率', default=0) - files = models.ManyToManyField(File, verbose_name="反馈文件") + + file = models.CharField('反馈文件', max_length=200, null=True, blank=True) + is_yes = models.BooleanField('是否反馈', default=False) class Meta: verbose_name = '任务部门视图' verbose_name_plural = verbose_name diff --git a/server/apps/supervision/serializers.py b/server/apps/supervision/serializers.py index d8bab26..9caea8b 100644 --- a/server/apps/supervision/serializers.py +++ b/server/apps/supervision/serializers.py @@ -62,7 +62,6 @@ class RecordCreateSerializer(serializers.ModelSerializer): class TaksDetailSerializer(serializers.ModelSerializer): create_by_ = UserSimpleSerializer(source='create_by', read_only = True) belong_dept_ = OrganizationSimpleSerializer(source='belong_dept', read_only=True) - files_ = FileSimpleSerializer(source='files', many=True, read_only=True) class Meta: model = Task fields = '__all__' diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index e9f64e5..81716e9 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -392,4 +392,5 @@ class TaskDeptViewSet(ModelViewSet): obj = self.get_object() Record.objects.filter(task=obj.task, belong_dept=obj.dept).delete() # 删除相应上报记录 obj.delete() - return Response() \ No newline at end of file + return Response() + \ No newline at end of file diff --git a/server/apps/vod/migrations/0004_auto_20210908_1449.py b/server/apps/vod/migrations/0004_auto_20210908_1449.py new file mode 100644 index 0000000..bffbb92 --- /dev/null +++ b/server/apps/vod/migrations/0004_auto_20210908_1449.py @@ -0,0 +1,19 @@ +# Generated by Django 3.0.5 on 2021-09-08 06:49 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('vod', '0003_auto_20210706_1005'), + ] + + operations = [ + migrations.AlterField( + model_name='viewrecord', + name='video', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='record_video', to='vod.Video', verbose_name='点播视频'), + ), + ] diff --git a/server/server/settings_dev.py b/server/server/settings_dev.py index dca12b6..a589608 100644 --- a/server/server/settings_dev.py +++ b/server/server/settings_dev.py @@ -1,20 +1,20 @@ from .settings import * DEBUG = True DATABASES = { - # 'default': { - # 'ENGINE': 'django.db.backends.postgresql', - # 'NAME': 'cma', - # 'USER': 'postgres', - # 'PASSWORD': 'zctest1234', - # 'HOST': '47.95.0.242', - # 'PORT': '5432', - # } - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'cma', - 'USER': 'cma', - 'PASSWORD': 'cma123', - 'HOST': '172.16.80.102', - 'PORT': '5432', - } + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': 'cma', + 'USER': 'postgres', + 'PASSWORD': 'zctest1234', + 'HOST': '47.95.0.242', + 'PORT': '5432', + } + # 'default': { + # 'ENGINE': 'django.db.backends.postgresql', + # 'NAME': 'cma', + # 'USER': 'cma', + # 'PASSWORD': 'cma123', + # 'HOST': '172.16.80.102', + # 'PORT': '5432', + # } }