From 104a3ae8fe3e9275f28792b606e04e5a7cbddfa4 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Thu, 28 Jan 2021 21:49:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9troublefollowtask=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0gridlevel=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0377_troublefollowtask_gridlevel.py       | 19 +++++++++++++++++++
 safesite/models.py                            |  1 +
 safesite/tasks.py                             |  4 ++--
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 safesite/migrations/0377_troublefollowtask_gridlevel.py

diff --git a/safesite/migrations/0377_troublefollowtask_gridlevel.py b/safesite/migrations/0377_troublefollowtask_gridlevel.py
new file mode 100644
index 00000000..33a5e063
--- /dev/null
+++ b/safesite/migrations/0377_troublefollowtask_gridlevel.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.8 on 2021-01-28 21:45
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('safesite', '0376_troublefollowtask_usable'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='troublefollowtask',
+            name='gridlevel',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey', verbose_name='网格化层级'),
+        ),
+    ]
diff --git a/safesite/models.py b/safesite/models.py
index d3aa3dcd..bc0ed093 100644
--- a/safesite/models.py
+++ b/safesite/models.py
@@ -1097,6 +1097,7 @@ class TroubleFollowTask(models.Model):
     隐患跟踪任务
     """
     trouble = models.ForeignKey(Trouble, on_delete=models.CASCADE)
+    gridlevel = models.ForeignKey(Dickey, on_delete=models.CASCADE, verbose_name='网格化层级', null=True, blank=True)
     user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name="跟踪人")
     taskadd = models.DateTimeField('任务创建时间', null=True, blank=True)
     taskdo = models.DateTimeField('任务执行时间', null=True, blank=True)
diff --git a/safesite/tasks.py b/safesite/tasks.py
index e05a8b12..2798fc0d 100644
--- a/safesite/tasks.py
+++ b/safesite/tasks.py
@@ -316,9 +316,9 @@ def sendGridtask2(**kwargs):
         nowtime = datetime.datetime.now()
         if obj.expire:
             newm = nowtime + datetime.timedelta(hours=int(obj.expire))
-            TroubleFollowTask.objects.create(trouble=obj.trouble,taskexpire = newm,taskadd=nowtime,taskset=obj,tasknote=obj.note,user=obj.user)
+            TroubleFollowTask.objects.create(trouble=obj.trouble,taskexpire = newm,taskadd=nowtime,taskset=obj,tasknote=obj.note,user=obj.user,gridlevel=obj.gridlevel)
         else:
-            TroubleFollowTask.objects.create(trouble=obj.trouble,taskadd=nowtime,istask=1,taskset=obj,tasknote=obj.note,user=obj.user)
+            TroubleFollowTask.objects.create(trouble=obj.trouble,taskadd=nowtime,taskset=obj,tasknote=obj.note,user=obj.user,gridlevel=obj.gridlevel)
         obj.last_run_at = nowtime
         obj.count = obj.count+1
         obj.save()