Pārlūkot izejas kodu

优化代理订单查询

zhangdongming 1 mēnesi atpakaļ
vecāks
revīzija
d63760feec

+ 1 - 1
AdminController/CloudServiceManage/AgentCustomerController.py

@@ -630,7 +630,7 @@ class AgentCustomerView(View):
                 end_month = start_month + 2
                 end_month = start_month + 2
 
 
                 start_date = datetime(year, start_month, 1)
                 start_date = datetime(year, start_month, 1)
-                end_date = datetime(year + 1, 1, 1) if end_month == 12 else datetime(year, end_month + 1, 1)
+                end_date = datetime(year + 1, 1, 2) if end_month == 12 else datetime(year, end_month + 1, 1)
 
 
                 start_time = int(start_date.timestamp())
                 start_time = int(start_date.timestamp())
                 end_time = int(end_date.timestamp()) - 1
                 end_time = int(end_date.timestamp()) - 1

+ 1 - 1
AdminController/CloudServiceManage/AgentDeviceController.py

@@ -286,7 +286,7 @@ class AgentDeviceView(View):
                 ).values_list('serial_number', flat=True))
                 ).values_list('serial_number', flat=True))
 
 
                 for row in unique_serial_numbers:
                 for row in unique_serial_numbers:
-                    serial_number = row.get('serial_number')
+                    serial_number = row
                     if serial_number not in existing:
                     if serial_number not in existing:
                         device = AgentDevice(
                         device = AgentDevice(
                             ac_id=ac_id,
                             ac_id=ac_id,