Merge remote-tracking branch 'origin/development' into development

app/api/export/crud.py

@@ -318,9 +318,9 @@ class AbnormalDataDetails(object):
         income_order_number = [i['order_number'] for i in income_data]
         error_order_number = list(set(out_order_number) ^ set(income_order_number))
         if len(error_order_number) == 1:
-            error_sql = f"select uuid,type,reference_type,order_number,amount/1000 as amount,create_time from {self.date} where order_number='{error_order_number[0]}'"
+            error_sql = f"select uuid,type,reference_type,reference_number,order_number,amount/1000 as amount,create_time from {self.date} where order_number='{error_order_number[0]}'"
         elif len(error_order_number) > 1:
-            error_sql = f"select uuid,type,reference_type,order_number,amount/1000 as amount,create_time from {self.date} where order_number in{tuple(error_order_number)}"
+            error_sql = f"select uuid,type,reference_type,reference_number,order_number,amount/1000 as amount,create_time from {self.date} where order_number in{tuple(error_order_number)}"
         else:
             return []
         res = LinkMysql(env.DB_HISTORY).query_mysql(error_sql)

app/api/export/views.py

@@ -110,7 +110,8 @@ def reference_type_total(date: str, type: str):
 
 
 @router.get("/abnormal/data")
-def abnormal_total(date: str, type: str, token=Depends(login_required)):
+def abnormal_total(date: str, type: str, page: Optional[int] = None, size: Optional[int] = None,
+                   token=Depends(login_required)):
     """异常数据详情"""
     if not all([date, type]):
         return HttpResultResponse(code=500, msg='缺少必传参数')