修改联通后台查询流量

AdminController/dataSystemManagement/UnicomDataController.py

@@ -66,8 +66,8 @@ class UnicomDataView(View):
         redis_obj = RedisObject()
         iccid_list = []
         try:
-            iccid_qs = UnicomComboOrderInfo.objects.all()
             if query_type == '1':  # 查询联通测试流量信息
+                iccid_qs = UnicomComboOrderInfo.objects.all()
                 iccid_qs = iccid_qs.filter(combo__combo_type=1)
                 if user_id:
                     user_qs = UnicomDeviceInfo.objects.filter(user_id=user_id).values('iccid')
@@ -85,14 +85,11 @@ class UnicomDataView(View):
                     item['user_id'] = user_qs[0]['user_id'] if user_qs.exists() else ''
                     iccid_list.append(item)
             elif query_type == '2':  # 查询联通月度流量信息
-                iccid_qs = iccid_qs.filter(combo__combo_type__in=[0, 1, 2])
+                iccid_qs = UnicomDeviceInfo.objects.filter(card_type=0)
                 if iccid:
                     iccid_qs = iccid_qs.filter(iccid=iccid)
                 if user_id:
-                    user_qs = UnicomDeviceInfo.objects.filter(user_id=user_id).values('iccid')
-                    if not user_qs.exists():
-                        return response.json(173)
-                    iccid_qs = iccid_qs.filter(iccid=user_qs[0]['iccid'])
+                    iccid_qs = iccid_qs.filter(user_id=user_id)
                 iccid_qs = iccid_qs.values('iccid').distinct().order_by('iccid')
                 count = iccid_qs.count()
                 iccid_qs = iccid_qs[(page - 1) * line:page * line]