bug修改

server/apps/supervision/migrations/0018_auto_20210401_0834.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.0.5 on 2021-04-01 00:34
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('supervision', '0017_remove_record_is_uped'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='task',
+            name='confirm_rate',
+        ),
+        migrations.RemoveField(
+            model_name='task',
+            name='up_rate',
+        ),
+    ]

server/apps/supervision/migrations/0019_auto_20210401_0842.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.5 on 2021-04-01 00:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('supervision', '0018_auto_20210401_0834'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='task',
+            name='confirm_rate',
+            field=models.IntegerField(default=0, verbose_name='确认率'),
+        ),
+        migrations.AddField(
+            model_name='task',
+            name='up_rate',
+            field=models.IntegerField(default=0, verbose_name='上报率'),
+        ),
+    ]

server/apps/supervision/views.py

@@ -177,16 +177,6 @@ def cal_task_rate(task, dept):
     计算任务上报率, 确认率
     传入任务及公司
     """
-    objs = Record.objects.filter(task=task)
-    # if objs.exists():
-    #     count = objs.count()
-    #     up_rate = objs.filter(state__in=['已确认','已上报']).count()/count
-    #     confirm_rate = objs.filter(state='已确认').count()/count
-    #     task.up_rate = int(up_rate*100)
-    #     task.confirm_rate = int(confirm_rate*100)
-    #     if task.confirm_rate == 100:
-    #         task.state ='已完成'
-    #     task.save()
     objs = Record.objects.filter(task=task).filter(belong_dept=dept)
     count = objs.count()
     up_rate = objs.filter(up_user__isnull=False).count()/count