增加版本查询code条件

Controller/AppInfo.py

@@ -53,6 +53,8 @@ class AppInfo(View):
                 return self.update(request_dict, userID, response)
             elif operation == 'delete':
                 return self.delete(request_dict, userID, response)
+            else:
+                return response.json(414)
 
     def getAppNewVersion(self, request_dict, response):
         appBundleId = request_dict.get('appBundleId', None)
@@ -113,15 +115,13 @@ class AppInfo(View):
                         content=content,
                         app_type=app_type,
                         bundleVersion=bundleVersion,
-                        downloadLink=downloadLink,
-                    )
+                        downloadLink=downloadLink)
                     app_Info.save()
                 except Exception:
                     errorInfo = traceback.format_exc()
                     print(errorInfo)
                     return response.json(500, {'details': errorInfo})
                 else:
-                    app_Info.save()
                     if app_Info.id:
                         res = {'appBundleId': app_Info.appBundleId,
                                'appName': app_Info.appName,

Controller/EquipmentOTA.py

@@ -61,7 +61,7 @@ class EquipmentOTA(View):
     def delete(self, request_dict, userID, response):
         eid = request_dict.get('eid', None)
         if not eid:
-            return response.json(444,'eid')
+            return response.json(444, 'eid')
         own_perm = ModelService.check_perm(userID=userID, permID=230)
         if not own_perm:
             return response.json(404)
@@ -77,7 +77,7 @@ class EquipmentOTA(View):
                 os.remove(filepath)
             ev.delete()
         except Exception as e:
-            return response.json(176,repr(e))
+            return response.json(176, repr(e))
         else:
             return response.json(0)
 
@@ -210,19 +210,20 @@ class EquipmentVersionView(View):
         mci = request_dict.get('mci', None)
         page = request_dict.get('page', None)
         line = request_dict.get('line', None)
+        code = request_dict.get('code', None)
         if not page or not line:
             return response.json(444, 'page,line')
         else:
             page = int(page)
             line = int(line)
+        cv_qs = Equipment_Version.objects
         if mci is not None:
-            cv_qs = Equipment_Version.objects.filter(mci=mci).order_by('code').values_list('code', flat=True).distinct()
-            count = cv_qs.count()
-            cv_qs = list(cv_qs[(page - 1) * line:page * line])
-        else:
-            cv_qs = Equipment_Version.objects.order_by('code').values_list('code', flat=True).distinct()
-            count = cv_qs.count()
-            cv_qs = list(cv_qs[(page - 1) * line:page * line])
+            cv_qs = cv_qs.filter(mci=mci)
+        if code is not None:
+            cv_qs = cv_qs.filter(code__contains=code)
+        cv_qs = cv_qs.order_by('code').values_list('code', flat=True).distinct()
+        count = cv_qs.count()
+        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()
         ev_list = CommonService.qs_to_list(ev_qs)

Service/CommonService.py

@@ -173,6 +173,7 @@ class CommonService:
     @staticmethod
     def qs_to_list(qs):
         res = []
+        print(qs)
         for ps in qs:
             if 'add_time' in ps:
                 ps['add_time'] = ps['add_time'].strftime("%Y-%m-%d %H:%M:%S")
@@ -181,6 +182,9 @@ class CommonService:
             if 'end_time' in ps:
                 ps['end_time'] = ps['end_time'].strftime("%Y-%m-%d %H:%M:%S")
             if 'data_joined' in ps:
-                ps['data_joined'] = ps['data_joined'].strftime("%Y-%m-%d %H:%M:%S")
+                if ps['data_joined']:
+                    ps['data_joined'] = ps['data_joined'].strftime("%Y-%m-%d %H:%M:%S")
+                else:
+                    ps['data_joined'] = ''
             res.append(ps)
         return res