From 6cffb4bf264b040e93149ca300ba4af503e9bdd4 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 31 Mar 2021 15:59:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E7=8E=87=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0016_record_is_uped.py          | 18 ++++++++++++++++++
 .../migrations/0017_remove_record_is_uped.py   | 17 +++++++++++++++++
 server/apps/supervision/views.py               |  2 +-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 server/apps/supervision/migrations/0016_record_is_uped.py
 create mode 100644 server/apps/supervision/migrations/0017_remove_record_is_uped.py

diff --git a/server/apps/supervision/migrations/0016_record_is_uped.py b/server/apps/supervision/migrations/0016_record_is_uped.py
new file mode 100644
index 0000000..fff8307
--- /dev/null
+++ b/server/apps/supervision/migrations/0016_record_is_uped.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2021-03-31 07:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('supervision', '0015_record_opinion'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='record',
+            name='is_uped',
+            field=models.BooleanField(default=False, verbose_name='是否上报'),
+        ),
+    ]
diff --git a/server/apps/supervision/migrations/0017_remove_record_is_uped.py b/server/apps/supervision/migrations/0017_remove_record_is_uped.py
new file mode 100644
index 0000000..dced7ee
--- /dev/null
+++ b/server/apps/supervision/migrations/0017_remove_record_is_uped.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.0.5 on 2021-03-31 07:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('supervision', '0016_record_is_uped'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='record',
+            name='is_uped',
+        ),
+    ]
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index 4c0b33e..845d96f 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -157,7 +157,7 @@ def cal_task_rate(task, dept):
     #     task.save()
     objs = Record.objects.filter(task=task).filter(belong_dept=dept)
     count = objs.count()
-    up_rate = objs.filter(state__in=['已确认','已上报']).count()/count
+    up_rate = objs.filter(up_user__isnull=False).count()/count
     confirm_rate = objs.filter(state='已确认').count()/count
     instance = TaskDept.objects.get(task=task,dept=dept)
     instance.up_rate = int(up_rate*100)