cvqs

Controller/EquipmentOTA.py

@@ -182,13 +182,15 @@ class EquipmentVersionView(View):
         else:
             page = int(page)
             line = int(line)
-        cv_qs = Equipment_Version.objects.filter(mci=mci).order_by('code').values('code').distinct()
-        return response.json(0,list(cv_qs))
         if mci is not None:
-            cv_qs = Equipment_Version.objects.filter(mci=mci).order_by('code').values('code').distinct()
-            # ev_qs = Equipment_Version.objects.filter(mci=mci).values()
+            cv_qs = Equipment_Version.objects.filter(mci=mci).order_by('code').values_list('code', flat=True).distinct()
+            cv_qs = list(cv_qs[(page - 1) * line:page * line])
         else:
-            ev_qs = Equipment_Version.objects.values()
+            cv_qs = Equipment_Version.objects.filter(mci=mci).order_by('code').values_list('code', flat=True).distinct()
+            cv_qs = list(cv_qs[(page - 1) * line:page * line])
+        return response.json(0, cv_qs)
+        ev_qs = Equipment_Version.objects.filter(code__in=list(cv_qs)).values()
+
         res = {
             'datas': CommonService.qs_to_list(ev_qs[(page - 1) * line:page * line]),
             'count': ev_qs.count()