PC查询检索

Controller/PcInfo.py

@@ -165,18 +165,23 @@ class PcInfo(View):
 
     def query(self, request_dict, response):
         pc_name = request_dict.get('pc_name', None)
+        bundle_version = request_dict.get('bundle_version', None)
+        pc_version = request_dict.get('pc_version', None)
+        pc_test = request_dict.get('pc_test', None)
         package = request_dict.get('package', None)
         file_type = request_dict.get('file_type', None)
-        if package is None and file_type is None and pc_name is None:
-            queryset = Pc_Info.objects.all()
-        elif package and file_type is None and pc_name is None:
+        if package and file_type is None and pc_name is None:
             queryset = Pc_Info.objects.filter(package=package)
         elif file_type and package is None and pc_name is None:
             queryset = Pc_Info.objects.filter(file_type=file_type)
         elif pc_name and file_type and package is None:
-            queryset = Pc_Info.objects.filter(pc_name=pc_name).filter(file_type=file_type)
+            queryset = Pc_Info.objects.filter(pc_name=pc_name, file_type=file_type)
         elif file_type and package and pc_name is None:
-            queryset = Pc_Info.objects.filter(file_type=file_type).filter(package=package)
+            queryset = Pc_Info.objects.filter(file_type=file_type, package=package)
+        elif pc_name and bundle_version and pc_version and pc_test:
+            queryset = Pc_Info.objects.filter(pc_name=pc_name, bundle_version=bundle_version, pc_version=pc_version, pc_test=pc_test)
+        else:
+            queryset = Pc_Info.objects.all()
         count = queryset.count()
         res = queryset
         send_json = CommonService.qs_to_dict(res)