fankui

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='反馈文件'),
+        ),
+    ]

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='是否反馈'),
+        ),
+    ]

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='反馈'),
+        ),
+    ]

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='反馈'),
+        ),
+    ]

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',
+        ),
+    ]

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

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__'

server/apps/supervision/views.py

@@ -393,3 +393,4 @@ class TaskDeptViewSet(ModelViewSet):
         Record.objects.filter(task=obj.task, belong_dept=obj.dept).delete() # 删除相应上报记录
         obj.delete()
         return Response()
+   

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='点播视频'),
+        ),
+    ]

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',
+         'USER': 'postgres',
-        'PASSWORD': 'cma123',
+         'PASSWORD': 'zctest1234',
-        'HOST': '172.16.80.102',
+         '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',
+   #  }
 }