|
@@ -140,11 +140,11 @@ class UnicomComboView(View):
|
|
|
return response.json(444)
|
|
return response.json(444)
|
|
|
page = int(pageNo)
|
|
page = int(pageNo)
|
|
|
line = int(pageSize)
|
|
line = int(pageSize)
|
|
|
- get_info_qs = UnicomDeviceInfo.objects.filter().values(
|
|
|
|
|
|
|
+ unicom_device_info_qs = UnicomDeviceInfo.objects.filter().values(
|
|
|
'iccid', 'serial_no', 'user_id', 'card_type', 'main_card', 'created_time'
|
|
'iccid', 'serial_no', 'user_id', 'card_type', 'main_card', 'created_time'
|
|
|
).order_by('-created_time')
|
|
).order_by('-created_time')
|
|
|
- total = get_info_qs.count()
|
|
|
|
|
- get_info_qs = get_info_qs[(page - 1) * line:page * line]
|
|
|
|
|
|
|
+ total = unicom_device_info_qs.count()
|
|
|
|
|
+ get_info_qs = unicom_device_info_qs[(page - 1) * line:page * line]
|
|
|
try:
|
|
try:
|
|
|
res_list = []
|
|
res_list = []
|
|
|
for item in get_info_qs:
|
|
for item in get_info_qs:
|
|
@@ -156,7 +156,7 @@ class UnicomComboView(View):
|
|
|
'mainCard': item['main_card'],
|
|
'mainCard': item['main_card'],
|
|
|
'createdTime': item['created_time']
|
|
'createdTime': item['created_time']
|
|
|
}
|
|
}
|
|
|
- usreID = get_info_qs[0]['user_id']
|
|
|
|
|
|
|
+ usreID = item['user_id']
|
|
|
user_info_qs = Device_User.objects.filter(userID=usreID).values(
|
|
user_info_qs = Device_User.objects.filter(userID=usreID).values(
|
|
|
'NickName', 'phone')
|
|
'NickName', 'phone')
|
|
|
if user_info_qs.exists():
|
|
if user_info_qs.exists():
|
