Selaa lähdekoodia

添加导出用户反馈信息数据接口

guanhailong 2 vuotta sitten
vanhempi
commit
4215ca8b6a
1 muutettua tiedostoa jossa 6 lisäystä ja 5 poistoa
  1. 6 5
      AdminController/UserManageController.py

+ 6 - 5
AdminController/UserManageController.py

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