gskh
/
approval
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Marsway 2026-02-03 17:43:13 +08:00
parent 862e3270b5
commit 830720e0d2
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/services/huobanyun_service.py
View File

@ -198,24 +198,21 @@ class HuobanyunService:
payload: Dict[str, Any] = {"table_id": table_id, "limit": limit, "offset": offset} payload: Dict[str, Any] = {"table_id": table_id, "limit": limit, "offset": offset}
order_status_field = self._resolve_field_key("订单状态") order_status_field = self._resolve_field_key("订单状态")
project_no_field = "proj_id"
project_no_field_id = self._resolve_field_key("项目单号") project_no_field_id = self._resolve_field_key("项目单号")
base_filters: List[Dict[str, Any]] = [ base_filters: List[Dict[str, Any]] = [
{"field": project_no_field, "query": {"em": False}}, {"field": project_no_field_id, "query": {"em": False}},
{"field": order_status_field, "query": {"ne": ["已完成"]}}, {"field": order_status_field, "query": {"ne": ["已完成"]}},
] ]
if linkage_project_no: if linkage_project_no:
base_filters.append( base_filters.append(
{ {
"or": [ "field": project_no_field_id,
{"field": project_no_field, "query": {"in": [str(linkage_project_no)]}}, "query": {"in": [str(linkage_project_no)]},
{"field": project_no_field_id, "query": {"in": [str(linkage_project_no)]}},
]
} }
) )
payload["filter"] = {"and": base_filters} payload["filter"] = {"and": base_filters}
elif key and query_value: elif key and query_value:
filter_field = project_no_field if key == "2200000149785345" else key filter_field = project_no_field_id if key == "2200000149785345" else key
base_filters.append({"field": filter_field, "query": {"in": [str(query_value)]}}) base_filters.append({"field": filter_field, "query": {"in": [str(query_value)]}})
payload["filter"] = {"and": base_filters} payload["filter"] = {"and": base_filters}
elif raw.get("filter"): elif raw.get("filter"):
@ -223,10 +220,8 @@ class HuobanyunService:
elif query_value: elif query_value:
base_filters.append( base_filters.append(
{ {
"or": [ "field": project_no_field_id,
{"field": project_no_field, "query": {"in": [query_value]}}, "query": {"in": [query_value]},
{"field": project_no_field_id, "query": {"in": [query_value]}},
]
} }
) )
payload["filter"] = {"and": base_filters} payload["filter"] = {"and": base_filters}