报名详情列表新增故事征集

AdminController/EvaluationActivityController.py

@@ -47,9 +47,9 @@ class EvaluationActivityView(View):
             return self.add_activity_user(user_id, request_dict, response)
         elif operation == 'editActivityUser':
             return self.edit_activity_user(request_dict, response)
-        elif operation == 'addStoryCollectionUser':     # 新增故事征集客户信息
+        elif operation == 'addStoryCollectionUser':  # 新增故事征集客户信息
             return self.add_story_collection_user(user_id, request_dict, response)
-        elif operation == 'addStoryCollectionUserSuccess':     # 新增故事征集客户信息成功回调
+        elif operation == 'addStoryCollectionUserSuccess':  # 新增故事征集客户信息成功回调
             return self.add_story_collection_user_success(user_id, request_dict, response)
         else:
             return response.json(404)
@@ -303,9 +303,31 @@ class EvaluationActivityView(View):
             if phone:
                 user_qs = user_qs.filter(phone=phone)
             count = user_qs.count()
+            # 华为云
+            obs_client = ObsClient(
+                access_key_id=HUAWEICLOUD_AK, secret_access_key=HUAWEICLOUD_SK, server=HUAWEICLOUD_OBS_SERVER)
+
             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]
-            return response.json(0, {'list': list(user_qs), 'count': count})
+                                     'usage_environment', 'is_reports', 'story',
+                                     'file_1_name', 'file_2_name')[(page - 1) * line:page * line]
+            activity_list = []
+            for item in user_qs:
+                activity_dict = {'id': item['id'], 'user_name': item['user_name'], 'phone': item['phone'],
+                                 'age': item['age'], 'address': item['address'], 'sex': item['sex'],
+                                 'is_selected': item['is_selected'], 'activity_id': item['activity_id'],
+                                 'usage_environment': item['usage_environment'], 'is_reports': item['is_reports'],
+                                 'story': item['story'], 'file_1_name': '', 'file_2_name': ''}
+                if item['file_1_name']:
+                    create_res = obs_client.createSignedUrl(
+                        method='GET', bucketName=HUAWEICLOUD_SERVER_BUKET, objectKey=item['file_1_name'], expires=300)
+                    activity_dict['file_1_name'] = create_res.signedUrl
+                if item['file_2_name']:
+                    create_res = obs_client.createSignedUrl(
+                        method='GET', bucketName=HUAWEICLOUD_SERVER_BUKET, objectKey=item['file_1_name'], expires=300)
+                    activity_dict['file_2_name'] = create_res.signedUrl
+                activity_list.append(activity_dict)
+
+            return response.json(0, {'list': activity_list, 'count': count})
         except Exception as e:
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))