Merge branch 'pzb' of ssh://192.168.136.45:10022/SERVER/AnsjerServer into pzb

Controller/FeedBack.py

@@ -105,7 +105,8 @@ class FeedBackView(View):
         uid = request_dict.get('uid', None)
         product_type = request_dict.get('product_type', None)
         app_version = request_dict.get('app_version', None)
-
+        appBundleId = request_dict.get('appBundleId', None)
+        email = request_dict.get('email', None)
         try:
             with transaction.atomic():
                 fb = FeedBackModel()
@@ -126,6 +127,10 @@ class FeedBackView(View):
                     fb.product_type = product_type
                 if app_version:
                     fb.app_version = app_version
+                if appBundleId:
+                    fb.appBundleId = appBundleId
+                if email:
+                    fb.email = email
                 fb.userID_id = userID
                 fb.save()
                 if res_1:
@@ -193,13 +198,19 @@ class FeedBackView(View):
                     filter_data = {'userID_id': ModelService.get_userID_byname(username)}
                 if type:
                     filter_data = {'type': type}
-                fb_qs = FeedBackModel.objects.filter()
+
+                try:
+                    fb_qs = FeedBackModel.objects.filter()
+                except Exception as e:
+                    return response.json(500, repr(e))
+                print('----------')
                 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', 'app',
                                                                     'uid', 'os_version', 'phone_model', 'product_type',
-                                                                    'updTime', 'userID__username','app_version')
+                                                                    'updTime', 'userID__username','app_version','appBundleId','email'
+                                                                    )
                 sid_list = []
                 print(fb_qs)
                 for fb in fb_qs:

Model/models.py

@@ -378,6 +378,9 @@ class FeedBackModel(models.Model):
     product_type = models.CharField(max_length=32, default='', verbose_name='设备uid')
     app_version = models.CharField(max_length=32, default='', verbose_name='app版本信息')
 
+    appBundleId = models.CharField(max_length=32, default='', verbose_name='app版本appBundleId')
+    email = models.CharField(max_length=32, default='', verbose_name='app版本email')
+
     def __str__(self):
         return self.id