|
@@ -427,10 +427,13 @@ class PcTest(View):
|
|
|
return response.json(0)
|
|
|
|
|
|
def logquery(self, request_dict, userID, response):
|
|
|
- if userID == 1:
|
|
|
- job_device_list = PctestlogModel.objects.values('id', 'user__id', 'user__username', 'content', 'addtime')
|
|
|
+ startDateTime = request_dict.get('startDateTime', None)
|
|
|
+ endDateTime = request_dict.get('endDateTime', None)
|
|
|
+ userid = request_dict.get('userid', None)
|
|
|
+ if userid :
|
|
|
+ job_device_list = PctestlogModel.objects.filter(user_id=userID,addtime__range=(startDateTime, endDateTime)).values('id', 'user__id', 'user__username', 'content', 'addtime')
|
|
|
else:
|
|
|
- job_device_list = PctestlogModel.objects.filter(user_id=userID).values('id', 'user__id', 'user__username', 'content', 'addtime')
|
|
|
+ job_device_list = PctestlogModel.objects.filter(addtime__range=(startDateTime, endDateTime)).values('id', 'user__id', 'user__username', 'content', 'addtime')
|
|
|
device_list = []
|
|
|
for i in job_device_list:
|
|
|
device_list.append(i)
|