From 6625c16308a3a30ad1f87c566ce24426eae2f18e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 3 Jan 2022 23:33:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=89=88=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=89=A7=E8=A1=8C=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/daoru.py | 2 +- safesite/models.py | 3 +- safesite/templates/checklisttaskdo.html | 132 ++++++++++++++++++++++++ safesite/urls.py | 1 + safesite/views.py | 17 ++- 5 files changed, 151 insertions(+), 4 deletions(-) create mode 100644 safesite/templates/checklisttaskdo.html diff --git a/safesite/daoru.py b/safesite/daoru.py index 45975c82..1ca54b61 100644 --- a/safesite/daoru.py +++ b/safesite/daoru.py @@ -75,7 +75,7 @@ def drquestions(companyid,path,userid): notinlist = [] while sheet['c'+str(i)].value!=None: type = sheet['a'+str(i)].value.replace(' ', '') - cate = sheet['b'+str(i)].value.replace(' ', '') + cate = str(sheet['b'+str(i)]).value.replace(' ', '') title = sheet['c'+str(i)].value answer = {} if sheet['d'+str(i)].value: diff --git a/safesite/models.py b/safesite/models.py index d7828abe..f4dfefe7 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -1156,7 +1156,8 @@ class RiskActTask(models.Model): # 风险点排查执行记录 user = models.ForeignKey( User, on_delete=models.CASCADE, 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, verbose_name='开始执行时间') + taskdo2 = models.DateTimeField(null=True, blank=True, verbose_name='提交时间') taskexpire = models.DateTimeField(null=True, blank=True) usable = models.IntegerField(default=1) # 1是可用,2是变更计划,0是不可用 type = models.IntegerField(default=1) # 1是计划内,2是计划外 diff --git a/safesite/templates/checklisttaskdo.html b/safesite/templates/checklisttaskdo.html new file mode 100644 index 00000000..7c0956e4 --- /dev/null +++ b/safesite/templates/checklisttaskdo.html @@ -0,0 +1,132 @@ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/safesite/urls.py b/safesite/urls.py index 8a3191a1..e77940ef 100644 --- a/safesite/urls.py +++ b/safesite/urls.py @@ -152,6 +152,7 @@ urlpatterns = [ path('html/offence/detail//', views.offencedetail), # 检查表 path('html/checklist/', views.checklisthtml), + path('html/checklisttaskdo/', views.checklisttaskdo_html), path('html/safelist/', views.safelist), path('html/safefeedback/', views.safefeedback), diff --git a/safesite/views.py b/safesite/views.py index b2bcb046..ef994617 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -214,6 +214,8 @@ def riskcheck(req): # 风险点排查记录 def taskdo(req): return render(req, 'taskdo.html') +def checklisttaskdo_html(req): + return render(req, 'checklisttaskdo.html') def task(req): return render(req, 'task.html') @@ -8224,8 +8226,12 @@ def apiriskacttask(req): userid = req.session['userid'] companyid = getcompany(userid) if a == 'listalltask': # 全厂任务 - objs = RiskActTask.objects.filter(riskact__usecomp__partid=companyid, istask=1).order_by('-pk','-usable', 'riskact__group__groupid').values('riskact__group__groupname', 'riskact__area__name', - 'riskact__type__dickeyname', 'riskact__id', 'riskact__group__groupid', 'riskact__name', 'riskact__level', 'riskact__tasktype', 'taskadd', 'taskexpire', 'user__userid', 'usable', 'taskdo', 'user__name') + objs = RiskActTask.objects.filter(riskact__usecomp__partid=companyid, istask=1).order_by('-pk','-usable', 'riskact__group__groupid') + objs = objs.filter(riskact__table_type=req.GET.get('table_type', 1)) + objs = objs.values('riskact__group__groupname', 'riskact__area__name', + 'riskact__type__dickeyname', 'riskact__id', 'riskact__group__groupid', + 'riskact__name', 'riskact__level', 'riskact__tasktype', 'taskadd', 'taskexpire', + 'user__userid', 'usable', 'taskdo', 'user__name') total = objs.count() startnum, endnum = fenye(req) objs = objs[startnum:endnum] @@ -8239,6 +8245,7 @@ def apiriskacttask(req): objs = objs.filter(taskdo_gte=req.GET.get('qssj')) if req.GET.get('jssj'): objs = objs.filter(taskdo__lte=req.GET.get('jssj')) + objs = objs.filter(riskact__table_type=req.GET.get('table_type', 1)) total = objs.count() startnum, endnum = fenye(req) objs = objs.order_by('-taskdo')[startnum:endnum].values('id', 'riskact__name', 'riskact__area__name', 'riskact__place', @@ -8246,6 +8253,7 @@ def apiriskacttask(req): return HttpResponse(transjson(total, objs), content_type="application/json") elif a == 'listalltodo': # 全厂待办任务 objs = RiskActTask.objects.filter(istask=1, taskdo=None, usable=1) + objs = objs.filter(riskact__table_type=req.GET.get('table_type', 1)) total = objs.count() startnum, endnum = fenye(req) objs = objs[startnum:endnum].values('id', 'riskact__group__groupname', 'riskact__area__name', 'riskact__type__dickeyname', 'riskact__id', @@ -8253,6 +8261,7 @@ def apiriskacttask(req): return HttpResponse(transjson(total, objs), content_type="application/json") elif a == 'listself': # 排查记录 a = RiskActTask.objects.filter(user__userid=userid) + objs = objs.filter(riskact__table_type=req.GET.get('table_type', 1)) total = a.count() startnum, endnum = fenye(req) a = a.order_by('-id')[startnum:endnum].values('id', 'riskact__level', 'riskact__name', 'riskact__area__name', 'riskact__place', @@ -8262,6 +8271,7 @@ def apiriskacttask(req): groups = Group.objects.filter(users__userid=userid) objs = RiskActTask.objects.filter( riskact__group__in=groups, usable=1, istask=1, user=None) + objs = objs.filter(riskact__table_type=req.GET.get('table_type', 1)) total = objs.count() startnum, endnum = fenye(req) objs = objs[startnum:endnum].values('id', 'riskact__group__groupname', 'riskact__area__name', 'riskact__type__dickeyname', 'riskact__id', @@ -8269,6 +8279,7 @@ def apiriskacttask(req): return HttpResponse(transjson(total, objs), content_type="application/json") elif a == 'listmytodo2': # 我的待办 objs = RiskActTask.objects.filter(usable=1, istask=1, user__userid=userid) + objs = objs.filter(riskact__table_type=req.GET.get('table_type', 1)) total = objs.count() startnum, endnum = fenye(req) objs = objs.order_by('-id')[startnum:endnum].values('id', 'riskact__group__groupname', 'riskact__area__name', 'riskact__type__dickeyname', 'riskact__id', @@ -8278,10 +8289,12 @@ def apiriskacttask(req): groups = Group.objects.filter(users__userid=userid) objs = RiskActTask.objects.filter( riskact__group__in=groups, usable=1, user=None) + objs = objs.filter(riskact__table_type=req.GET.get('table_type', 1)) total = objs.count() return JsonResponse({"code": 1, "todonum": total}) elif a == 'todonum2': # 我的待办统计 objs = RiskActTask.objects.filter(usable=1, user__userid=userid,taskdo=None) + objs = objs.filter(riskact__table_type=req.GET.get('table_type', 1)) total = objs.count() return JsonResponse({"code": 1, "todonum": total}) elif a == 'detail':