|
|
@@ -475,7 +475,7 @@ class UserManagement(View):
|
|
|
def getFeedbackList(self, request_dict, response):
|
|
|
status = request_dict.get('status', 0)
|
|
|
username = request_dict.get('username', None)
|
|
|
- collect_status = request_dict.get('collectStatus', 0)
|
|
|
+ collectStatus = request_dict.get('collectStatus', None)
|
|
|
pageNo = request_dict.get('pageNo', None)
|
|
|
pageSize = request_dict.get('pageSize', None)
|
|
|
if not all([pageNo, pageSize]):
|
|
|
@@ -484,13 +484,13 @@ class UserManagement(View):
|
|
|
line = int(pageSize)
|
|
|
try:
|
|
|
filter_data = {}
|
|
|
- if status or username or collect_status:
|
|
|
+ if status or username or collectStatus:
|
|
|
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 collectStatus:
|
|
|
+ filter_data['collect_status'] = int(collectStatus)
|
|
|
feed_back_qs = FeedBackModel.objects.filter()
|
|
|
if filter_data:
|
|
|
feed_back_qs = feed_back_qs.filter(**filter_data).values()
|
|
|
@@ -692,15 +692,15 @@ class UserManagement(View):
|
|
|
|
|
|
def exportFeedBack(self, request_dict, response):
|
|
|
status = request_dict.get('status', None)
|
|
|
- collect_status = request_dict.get('collectStatus', None)
|
|
|
+ collectStatus = request_dict.get('collectStatus', None)
|
|
|
try:
|
|
|
with transaction.atomic():
|
|
|
filter_data = {}
|
|
|
- if status or collect_status:
|
|
|
+ if status or collectStatus:
|
|
|
if status:
|
|
|
filter_data['status'] = int(status)
|
|
|
- if collect_status:
|
|
|
- filter_data['collect_status'] = int(collect_status)
|
|
|
+ if collectStatus:
|
|
|
+ filter_data['collect_status'] = int(collectStatus)
|
|
|
feed_back_qs = FeedBackModel.objects.filter()
|
|
|
if filter_data:
|
|
|
feed_back_qs = feed_back_qs.filter(**filter_data)
|
