|
@@ -12,11 +12,11 @@
|
|
|
import time
|
|
|
|
|
|
from django.views.generic.base import View
|
|
|
-from Model.models import FreeEvaluationActivity, ActivityTime, ActivityUser
|
|
|
+from Model.models import FreeEvaluationActivity, ActivityTime, ActivityUser, Device_User
|
|
|
from Object.AWS.AmazonS3Util import AmazonS3Util
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
-from Ansjer.config import SECRET_ACCESS_KEY, ACCESS_KEY_ID, REGION_NAME
|
|
|
+from Ansjer.config import SECRET_ACCESS_KEY, ACCESS_KEY_ID, REGION_NAME, SERVER_DOMAIN
|
|
|
from django.db import transaction
|
|
|
|
|
|
|
|
@@ -76,7 +76,18 @@ class EvaluationActivityView(View):
|
|
|
activity['activity_status'] = 2 # 1:可报名;2:已报名;3:报名截止;4:活动结束
|
|
|
else:
|
|
|
activity['activity_status'] = 1
|
|
|
- user_qs = user_qs.filter(is_selected=1).values('user_name', 'phone')
|
|
|
+ user_qs = user_qs.filter(is_selected=1).values('user_name', 'phone', 'user_id')
|
|
|
+ for item in user_qs:
|
|
|
+ users = Device_User.objects.filter(userID=item['user_id']).values('userIconPath')
|
|
|
+ if users.exists():
|
|
|
+ user_icon_path = str(users[0]['userIconPath'])
|
|
|
+ if user_icon_path and user_icon_path.find('static/') != -1:
|
|
|
+ user_icon_path = user_icon_path.replace('static/', '').replace('\\', '/')
|
|
|
+ item['user_icon'] = SERVER_DOMAIN + 'account/getAvatar/' + user_icon_path
|
|
|
+ else:
|
|
|
+ item['user_icon'] = ''
|
|
|
+ else:
|
|
|
+ item['user_icon'] = ''
|
|
|
activity['activity_user'] = list(user_qs)
|
|
|
else:
|
|
|
activity['activity_status'] = 1
|