|
|
@@ -326,6 +326,8 @@ class UserManagement(View):
|
|
|
return self.getSysMessageList(request_dict, response)
|
|
|
elif operation == 'collectFeedBack':
|
|
|
return self.collectFeedBack(request_dict, response)
|
|
|
+ elif operation == 'exportFeedBack':
|
|
|
+ return self.exportFeedBack(request_dict, response)
|
|
|
else:
|
|
|
return response.json(404)
|
|
|
|
|
|
@@ -474,7 +476,6 @@ class UserManagement(View):
|
|
|
status = request_dict.get('status', 0)
|
|
|
username = request_dict.get('username', None)
|
|
|
collect_status = request_dict.get('collectStatus', 0)
|
|
|
- fileType = request_dict.get('fileType', None) # 导出参数
|
|
|
pageNo = request_dict.get('pageNo', None)
|
|
|
pageSize = request_dict.get('pageSize', None)
|
|
|
if not all([pageNo, pageSize]):
|
|
|
@@ -483,15 +484,13 @@ class UserManagement(View):
|
|
|
line = int(pageSize)
|
|
|
try:
|
|
|
filter_data = {}
|
|
|
- if status or username or collect_status or fileType:
|
|
|
+ if status or username or collect_status:
|
|
|
if status:
|
|
|
filter_data['status'] = int(status)
|
|
|
if username:
|
|
|
filter_data['userID_id'] = ModelService.get_userID_byname(username)
|
|
|
if collect_status:
|
|
|
filter_data['collect_status'] = int(collect_status)
|
|
|
- if fileType: # 判断是否导出
|
|
|
- return self.download(status, collect_status, response)
|
|
|
feed_back_qs = FeedBackModel.objects.filter()
|
|
|
if filter_data:
|
|
|
feed_back_qs = feed_back_qs.filter(**filter_data).values()
|
|
|
@@ -691,7 +690,9 @@ class UserManagement(View):
|
|
|
FeedBackModel.objects.filter(id=feedBackID).update(collect_status=collect_status)
|
|
|
return response.json(0)
|
|
|
|
|
|
- def download(self, status, collect_status, response):
|
|
|
+ def exportFeedBack(self, request_dict, response):
|
|
|
+ status = request_dict.get('status', None)
|
|
|
+ collect_status = request_dict.get('collectStatus', None)
|
|
|
try:
|
|
|
with transaction.atomic():
|
|
|
filter_data = {}
|
