diff --git a/safesite/tasks.py b/safesite/tasks.py index 0e407719..3301cc8b 100644 --- a/safesite/tasks.py +++ b/safesite/tasks.py @@ -311,16 +311,28 @@ def sendGridtask(obj): @shared_task def sendGridtask2(**kwargs): obj = GridTaskSet.objects.get(id=kwargs['gridtaskset']) - RiskActTask.objects.filter(taskset=obj, usable=1).update(usable=0) - nowtime = datetime.datetime.now() - if obj.expire: - newm = nowtime + datetime.timedelta(hours=int(obj.expire)) - RiskActTask.objects.create(riskact=obj.riskact,taskexpire = newm,taskadd=nowtime,istask=1,taskset=obj,tasknote=obj.note,user=obj.user) - else: - RiskActTask.objects.create(riskact=obj.riskact,taskadd=nowtime,istask=1,taskset=obj,tasknote=obj.note,user=obj.user) - obj.last_run_at = nowtime - obj.count = obj.count+1 - obj.save() + if obj.trouble: + 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) + else: + TroubleFollowTask.objects.create(trouble=obj.trouble,taskadd=nowtime,istask=1,taskset=obj,tasknote=obj.note,user=obj.user) + obj.last_run_at = nowtime + obj.count = obj.count+1 + obj.save() + + elif obj.riskact: + RiskActTask.objects.filter(taskset=obj, usable=1).update(usable=0) + nowtime = datetime.datetime.now() + if obj.expire: + newm = nowtime + datetime.timedelta(hours=int(obj.expire)) + RiskActTask.objects.create(riskact=obj.riskact,taskexpire = newm,taskadd=nowtime,istask=1,taskset=obj,tasknote=obj.note,user=obj.user) + else: + RiskActTask.objects.create(riskact=obj.riskact,taskadd=nowtime,istask=1,taskset=obj,tasknote=obj.note,user=obj.user) + obj.last_run_at = nowtime + obj.count = obj.count+1 + obj.save() @shared_task def expireRiskacttask(): diff --git a/safesite/templates/troublefollow.html b/safesite/templates/troublefollow.html index 5bccff65..119d2fc1 100644 --- a/safesite/templates/troublefollow.html +++ b/safesite/templates/troublefollow.html @@ -1,12 +1,31 @@ -
-
- 创建隐患跟踪任务 - +
+
+
+ {% load myfilter %} + {% if request|has_permission:'b_troublefollowtaskset_add' %} + 创建隐患跟踪计划 + {% endif %} + {% if request|has_permission:'b_troublefollowtaskset_edit' %} + 编辑计划 + {% endif %} + {% if request|has_permission:'b_troublefollowtaskset_del' %} + 删除 + {% endif %} +
+ +
+ +
+
+
+
-
diff --git a/safesite/templates/troublefollowtasksetadd.html b/safesite/templates/troublefollowtasksetadd.html index e9041f77..0f53f3d8 100644 --- a/safesite/templates/troublefollowtasksetadd.html +++ b/safesite/templates/troublefollowtasksetadd.html @@ -57,7 +57,6 @@