优化更新联合查询

Service/EquipmentInfoService.py

@@ -122,19 +122,7 @@ class EquipmentInfoService:
         sunday_qs = EquipmentInfoService.get_equipment_info_model('', 7)
         sunday_qs = cls.query_equipment_info(sunday_qs, user_id, start_time, end_time, event_type,
                                              uid_list)
-        result = monday_qs
-        if tuesday_qs.exists():
-            result = result.union(tuesday_qs)
-        if wednesday_qs.exists():
-            result = result.union(wednesday_qs)
-        if thursday_qs.exists():
-            result = result.union(thursday_qs)
-        if friday_qs.exists():
-            result = result.union(friday_qs)
-        if saturday_qs.exists():
-            result = result.union(saturday_qs)
-        if sunday_qs.exists():
-            result = result.union(sunday_qs)
+        result = monday_qs.union(tuesday_qs, wednesday_qs, thursday_qs, friday_qs, saturday_qs, sunday_qs, all=True)
         count = result.count()
         qs_page = cls.get_equipment_info_page(result, page, size)
         return qs_page, count