diff --git a/safesite/views.py b/safesite/views.py index 64f7973b..aeb02fea 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -1,6 +1,7 @@ from captcha.helpers import captcha_image_url from captcha.models import CaptchaStore +from django.http import request from django.shortcuts import render, redirect from django.http import HttpResponse, HttpResponseRedirect, JsonResponse from .models import * @@ -7526,7 +7527,7 @@ def apiriskacttask(req): objs = RiskActTask.objects.filter(usable=1, istask=1, user__userid=userid) total = objs.count() startnum, endnum = fenye(req) - objs = objs[startnum:endnum].values('id', 'riskact__group__groupname', 'riskact__area__name', 'riskact__type__dickeyname', 'riskact__id', + objs = objs.order_by('-id')[startnum:endnum].values('id', 'riskact__group__groupname', 'riskact__area__name', 'riskact__type__dickeyname', 'riskact__id', 'riskact__group__groupid', 'riskact__name', 'riskact__level', 'riskact__tasktype', 'taskadd', 'taskexpire', 'user__userid', 'user__name') return HttpResponse(transjson(total, objs), content_type="application/json") elif a == 'todonum': @@ -7539,6 +7540,9 @@ def apiriskacttask(req): objs = RiskActTask.objects.filter(usable=1, user__userid=userid,taskdo=None) total = objs.count() return JsonResponse({"code": 1, "todonum": total}) + elif a == 'detail': + obj = RiskActTask.objects.filter(pk=req.GET.get('id')) + return JsonResponse({'code':1, 'data':obj.values('id', 'tasknote', 'note')[0]}) # elif a == 'listmydone': # groups = Group.objects.filter(users__userid=userid) # objs = Risktask.objects.filter(Q(group__in=groups)|Q(user__userid=userid),usable__in=[0,2]).values('risk__group__groupname','risk__riskact__area__name','risk__riskact__type__dickeyname','risk__riskact__id','risk__tasktype','taskadd','taskexpire','user__userid','usable').annotate(num = Count('risk__group')) @@ -7566,6 +7570,7 @@ def apiriskcheck2(req): obj.user = user obj.taskdo = nowtime obj.usable = 0 + obj.note = data['note'] if 'note' in data else None obj.save() else: obj = RiskActTask() @@ -7573,6 +7578,7 @@ def apiriskcheck2(req): obj.user = user obj.istask = 0 obj.taskdo = nowtime + obj.note = data['note'] if 'note' in data else None obj.save() for i in checkrisks: risk = Risk.objects.get(id=i['id']) diff --git a/需求/惠东需求.docx b/需求/惠东需求.docx new file mode 100644 index 00000000..28c65550 Binary files /dev/null and b/需求/惠东需求.docx differ diff --git a/需求/改进需求初步清单.docx b/需求/改进需求初步清单.docx new file mode 100644 index 00000000..a609503f Binary files /dev/null and b/需求/改进需求初步清单.docx differ diff --git a/需求/需求整理.xlsx b/需求/需求整理.xlsx new file mode 100644 index 00000000..cdb32741 Binary files /dev/null and b/需求/需求整理.xlsx differ