修改troublefollowtask增加gridlevel字段
This commit is contained in:
parent
5767253f21
commit
104a3ae8fe
|
@ -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='网格化层级'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -1097,6 +1097,7 @@ class TroubleFollowTask(models.Model):
|
||||||
隐患跟踪任务
|
隐患跟踪任务
|
||||||
"""
|
"""
|
||||||
trouble = models.ForeignKey(Trouble, on_delete=models.CASCADE)
|
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="跟踪人")
|
user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name="跟踪人")
|
||||||
taskadd = models.DateTimeField('任务创建时间', null=True, blank=True)
|
taskadd = models.DateTimeField('任务创建时间', null=True, blank=True)
|
||||||
taskdo = models.DateTimeField('任务执行时间', null=True, blank=True)
|
taskdo = models.DateTimeField('任务执行时间', null=True, blank=True)
|
||||||
|
|
|
@ -316,9 +316,9 @@ def sendGridtask2(**kwargs):
|
||||||
nowtime = datetime.datetime.now()
|
nowtime = datetime.datetime.now()
|
||||||
if obj.expire:
|
if obj.expire:
|
||||||
newm = nowtime + datetime.timedelta(hours=int(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:
|
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.last_run_at = nowtime
|
||||||
obj.count = obj.count+1
|
obj.count = obj.count+1
|
||||||
obj.save()
|
obj.save()
|
||||||
|
|
Loading…
Reference in New Issue