Browse Source

fix: honor order numbers in protocol workflow lists.

zlwu 4 tuần trước cách đây
mục cha
commit
7a6d804cfa

+ 12 - 3
backend/app/crud/collection_protocol.py

@@ -1507,7 +1507,10 @@ def list_audits(
     page = max(1, page)
     page = max(1, page)
     page_size = min(max(1, page_size), 100)
     page_size = min(max(1, page_size), 100)
     rows = (
     rows = (
-        q_base.order_by(BizProtocolAudit.create_time.desc())
+        q_base.order_by(
+            BizProtocolAudit.order_num.asc(),
+            BizProtocolAudit.create_time.desc(),
+        )
         .offset((page - 1) * page_size)
         .offset((page - 1) * page_size)
         .limit(page_size)
         .limit(page_size)
         .all()
         .all()
@@ -1682,7 +1685,10 @@ def list_receipt_confirm_details(
     page = max(1, page)
     page = max(1, page)
     page_size = min(max(1, page_size), 100)
     page_size = min(max(1, page_size), 100)
     rows = (
     rows = (
-        q_base.order_by(BizProtocolPaymentDetail.create_time.desc())
+        q_base.order_by(
+            BizProtocolPaymentDetail.order_num.asc(),
+            BizProtocolPaymentDetail.create_time.desc(),
+        )
         .offset((page - 1) * page_size)
         .offset((page - 1) * page_size)
         .limit(page_size)
         .limit(page_size)
         .all()
         .all()
@@ -1835,7 +1841,10 @@ def list_refund_confirm_details(
     page = max(1, page)
     page = max(1, page)
     page_size = min(max(1, page_size), 100)
     page_size = min(max(1, page_size), 100)
     rows = (
     rows = (
-        q_base.order_by(BizProtocolPaymentDetail.create_time.desc())
+        q_base.order_by(
+            BizProtocolPaymentDetail.order_num.asc(),
+            BizProtocolPaymentDetail.create_time.desc(),
+        )
         .offset((page - 1) * page_size)
         .offset((page - 1) * page_size)
         .limit(page_size)
         .limit(page_size)
         .all()
         .all()