|
|
@@ -226,6 +226,8 @@ class EvaluationActivityView(View):
|
|
|
@staticmethod
|
|
|
def get_user_list(request_dict, response):
|
|
|
activity_id = request_dict.get('activity_id', None)
|
|
|
+ user_name = request_dict.get('user_name', None)
|
|
|
+ phone = request_dict.get('phone', None)
|
|
|
page = request_dict.get('page', None)
|
|
|
line = request_dict.get('line', None)
|
|
|
if not all([activity_id, page, line]):
|
|
|
@@ -234,6 +236,10 @@ class EvaluationActivityView(View):
|
|
|
page = int(page)
|
|
|
line = int(line)
|
|
|
user_qs = ActivityUser.objects.filter(activity_id=activity_id)
|
|
|
+ if user_name:
|
|
|
+ user_qs = user_qs.filter(user_name=user_name)
|
|
|
+ if phone:
|
|
|
+ user_qs = user_qs.filter(phone=phone)
|
|
|
count = user_qs.count()
|
|
|
user_qs = user_qs.values('id', 'user_name', 'phone', 'age', 'address', 'sex', 'is_selected', 'activity_id',
|
|
|
'usage_environment', 'is_reports')[(page - 1) * line:page * line]
|
