提交

backend/app/crud/collection_protocol.py

@@ -1321,6 +1321,7 @@ def list_audits(
     page_size: int = 10,
     keyword: Optional[str] = None,
     audit_status: Optional[str] = None,
+    collection_protocol_id: Optional[str] = None,
     tenant_no: Optional[str] = None,
     user_info=None,
 ) -> Tuple[List[Dict[str, Any]], int]:
@@ -1339,10 +1340,18 @@ def list_audits(
         q_base = q_base.filter(BizProtocolAudit.tenant_no == tenant_no)
     if audit_status:
         q_base = q_base.filter(BizProtocolAudit.audit_status == audit_status.strip())
+    pid = (collection_protocol_id or "").strip()
+    if pid:
+        q_base = q_base.filter(BizProtocolAudit.collection_protocol_id == pid)
     kw = (keyword or "").strip()
     if kw:
         like = f"%{kw}%"
-        q_base = q_base.filter(BizProtocolAudit.audit_remark.like(like))
+        q_base = q_base.filter(
+            or_(
+                BizCollectionProtocol.protocol_no.like(like),
+                BizProtocolAudit.audit_remark.like(like),
+            )
+        )
     if user_info:
         from app.core.data_scope import apply_data_scope
         q_base = apply_data_scope(q_base, BizProtocolAudit, user_info, db, tenant_no)