增加了项目侧关于steps的处理。允许保存和提取steps信息。
This commit is contained in:
@@ -76,7 +76,12 @@ class ContractSettlementDetailApiHandler(BaseApiHandler):
|
||||
push_id = self._generate_push_id()
|
||||
|
||||
try:
|
||||
response = await api_create_contract_settlement_detail(self.api_client, create_model, push_id)
|
||||
response = await api_create_contract_settlement_detail(
|
||||
self.api_client,
|
||||
create_model,
|
||||
push_id,
|
||||
steps=self._get_request_steps(node),
|
||||
)
|
||||
if self.poll_mode == "sync":
|
||||
created_id = self._extract_created_id_from_response(response)
|
||||
if not created_id:
|
||||
@@ -118,7 +123,14 @@ class ContractSettlementDetailApiHandler(BaseApiHandler):
|
||||
origin_data = node.get_origin_data() or {}
|
||||
|
||||
# 使用 _get_schema_diff 检查差异并打印日志
|
||||
diff_fields = self._get_schema_diff(ContractSettlementDetailUpdate, data, origin_data, node.node_id)
|
||||
force_steps_update = self._steps_changed(node)
|
||||
diff_fields = self._get_schema_diff(
|
||||
ContractSettlementDetailUpdate,
|
||||
data,
|
||||
origin_data,
|
||||
node.node_id,
|
||||
force_full_schema=force_steps_update,
|
||||
)
|
||||
if not diff_fields:
|
||||
from ...common.types import SyncAction
|
||||
results.append(TaskResult.skipped(node_id=node.node_id, reason="No updatable fields changed"))
|
||||
@@ -131,7 +143,12 @@ class ContractSettlementDetailApiHandler(BaseApiHandler):
|
||||
continue
|
||||
|
||||
# 需要完整的 schema 数据(包括必填字段)
|
||||
update_data = self._filter_update_data(data, origin_data, ContractSettlementDetailUpdate)
|
||||
update_data = self._filter_update_data(
|
||||
data,
|
||||
origin_data,
|
||||
ContractSettlementDetailUpdate,
|
||||
force_full_schema=force_steps_update,
|
||||
)
|
||||
|
||||
try:
|
||||
update_model = ContractSettlementDetailUpdate.model_validate(update_data)
|
||||
@@ -145,6 +162,7 @@ class ContractSettlementDetailApiHandler(BaseApiHandler):
|
||||
|
||||
# 准备批量数据
|
||||
detail_list = [model.model_dump(mode='json', exclude_unset=True) for node, model in group_items]
|
||||
steps = self._get_request_steps(group_items[0][0]) if group_items else []
|
||||
|
||||
# 使用第一个节点的 biz_id(对于批量更新,通常使用 parent_id)
|
||||
biz_id = settlement_id
|
||||
@@ -156,9 +174,11 @@ class ContractSettlementDetailApiHandler(BaseApiHandler):
|
||||
{"detail_list": detail_list},
|
||||
push_id,
|
||||
biz_id,
|
||||
steps=steps,
|
||||
)
|
||||
# 整组成功
|
||||
for node, _ in group_items:
|
||||
self._mark_approval_snapshot_synced(node)
|
||||
results.append(TaskResult.success(node_id=node.node_id, push_id=push_id))
|
||||
except Exception as e:
|
||||
# 整组失败
|
||||
@@ -239,7 +259,13 @@ async def api_get_contract_settlement_detail_list(client, settlement_id: str) ->
|
||||
return validated_items
|
||||
|
||||
|
||||
async def api_create_contract_settlement_detail(client, data: ContractSettlementDetailCreate, push_id: str) -> Dict[str, Any]:
|
||||
async def api_create_contract_settlement_detail(
|
||||
client,
|
||||
data: ContractSettlementDetailCreate,
|
||||
push_id: str,
|
||||
*,
|
||||
steps: List[Dict[str, Any]] | None = None,
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
创建合同结算明细
|
||||
|
||||
@@ -255,14 +281,21 @@ async def api_create_contract_settlement_detail(client, data: ContractSettlement
|
||||
Raises:
|
||||
Exception: API 返回错误
|
||||
"""
|
||||
request_data = {"push_id": push_id, "data": data.model_dump(mode='json')}
|
||||
request_data = {"push_id": push_id, "data": data.model_dump(mode='json'), "steps": steps or []}
|
||||
response = await client.request(method="POST", endpoint="/contract_settlement/detail/create", data=request_data)
|
||||
if response.get("code") != 200:
|
||||
raise Exception(f"API error: {response.get('message', 'Unknown error')}")
|
||||
return response
|
||||
|
||||
|
||||
async def api_update_contract_settlement_detail(client, data: Dict[str, Any], push_id: str, biz_id: str) -> None:
|
||||
async def api_update_contract_settlement_detail(
|
||||
client,
|
||||
data: Dict[str, Any],
|
||||
push_id: str,
|
||||
biz_id: str,
|
||||
*,
|
||||
steps: List[Dict[str, Any]] | None = None,
|
||||
) -> None:
|
||||
"""
|
||||
更新合同结算明细
|
||||
|
||||
@@ -275,7 +308,7 @@ async def api_update_contract_settlement_detail(client, data: Dict[str, Any], pu
|
||||
Raises:
|
||||
Exception: API 返回错误
|
||||
"""
|
||||
request_data = {"push_id": push_id, "biz_id": biz_id, "data": data}
|
||||
request_data = {"push_id": push_id, "biz_id": biz_id, "data": data, "steps": steps or []}
|
||||
response = await client.request(method="PUT", endpoint="/contract_settlement/detail/update", data=request_data)
|
||||
if response.get("code") != 200:
|
||||
raise Exception(f"API error: {response.get('message', 'Unknown error')}")
|
||||
|
||||
Reference in New Issue
Block a user