增加筛选

Controller/FeedBack.py

@@ -70,7 +70,7 @@ class FeedBackView(View):
             return response.json(444, 'page,line')
 
         fb_qs = FeedBackModel.objects.filter(userID_id=userID)[(page - 1) * line:page * line]. \
-            values('id', 'status', 'content', 'addTime', 'updTime','type')
+            values('id', 'status', 'content', 'addTime', 'updTime', 'type')
         sid_list = []
         for fb in fb_qs:
             sid_list.append(fb['id'])
@@ -119,7 +119,6 @@ class FeedBackView(View):
         else:
             return response.json(0)
 
-
     def do_get_upload_url(self, request_dict, response):
         uploadType = request_dict.get('uploadType', None)
         uploadType = json.loads(uploadType)
@@ -160,6 +159,7 @@ class FeedBackView(View):
             line = request_dict.get('line', None)
             status = request_dict.get('status', None)
             username = request_dict.get('username', None)
+            type = request_dict.get('type', None)
             if page and line:
                 page = int(page)
                 line = int(line)
@@ -168,20 +168,24 @@ class FeedBackView(View):
                     filter_data = {'status': status}
                 if username:
                     filter_data = {'userID_id': ModelService.get_userID_byname(username)}
+                if type:
+                    filter_data = {'type': type}
                 fb_qs = FeedBackModel.objects.filter()
                 if filter_data:
                     fb_qs = fb_qs.filter(**filter_data)
                 count = fb_qs.count()
-                fb_qs = fb_qs[(page - 1) * line:page * line].values('id','type', 'status', 'content', 'addTime', 'updTime','userID__username')
+                fb_qs = fb_qs[(page - 1) * line:page * line].values('id', 'type', 'status', 'content', 'addTime',
+                                                                    'updTime', 'userID__username')
                 sid_list = []
-                print (fb_qs)
+                print(fb_qs)
                 for fb in fb_qs:
                     sid_list.append(fb['id'])
-                sm_qs = StatResModel.objects.filter(feedbackmodel__id__in=sid_list).values('id', 'name', 'feedbackmodel__id')
+                sm_qs = StatResModel.objects.filter(feedbackmodel__id__in=sid_list).values('id', 'name',
+                                                                                           'feedbackmodel__id')
                 auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
                 bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
                 res = []
-                print ( sm_qs)
+                print(sm_qs)
                 for fb in fb_qs:
                     fb['img_url'] = []
                     for sm in sm_qs: