liwei
/
Vastai-ConnectHub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Marsway 2026-03-30 17:07:55 +08:00
parent a8eeaba84c
commit ea01e8455a
1 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
extensions/sync_ehr_leaves_to_oa/job.py
View File

@ -6,6 +6,8 @@ from datetime import date, datetime
from decimal import Decimal, InvalidOperation from decimal import Decimal, InvalidOperation
from typing import Any from typing import Any
import httpx
from app.integrations.seeyon import SeeyonClient from app.integrations.seeyon import SeeyonClient
from app.jobs.base import BaseJob from app.jobs.base import BaseJob
from extensions.sync_ehr_leaves_to_oa.api import SyncEhrLeavesToOaApi from extensions.sync_ehr_leaves_to_oa.api import SyncEhrLeavesToOaApi
@ -63,12 +65,12 @@ def _to_decimal(v: Any) -> Decimal:
def _decimal_to_str(v: Decimal) -> str: def _decimal_to_str(v: Decimal) -> str:
if v == v.to_integral(): # OA 字段请假天数为 DECIMAL(?,1)，统一保留 1 位小数（如 1.0）
return str(int(v)) try:
s = format(v.normalize(), "f") q = v.quantize(Decimal("0.1"))
if "." in s: except Exception:
s = s.rstrip("0").rstrip(".") q = Decimal("0.0")
return s return format(q, "f")
def _to_int_safe(v: Any) -> int: def _to_int_safe(v: Any) -> int:
@ -277,9 +279,10 @@ class SyncEhrLeavesToOaMonthJob(BaseJob):
to_update = 0 to_update = 0
to_insert = 0 to_insert = 0
for (job_no, leave_date), leave_days in sorted(agg.items(), key=lambda x: (x[0][0], x[0][1])): for (job_no, leave_date), leave_days in sorted(agg.items(), key=lambda x: (x[0][0], x[0][1])):
leave_date_value = f"{leave_date} 00:00:00"
fields_payload = [ fields_payload = [
{"name": field_job_no, "value": job_no, "showValue": job_no}, {"name": field_job_no, "value": job_no, "showValue": job_no},
{"name": field_leave_date, "value": leave_date, "showValue": leave_date}, {"name": field_leave_date, "value": leave_date_value, "showValue": leave_date},
{"name": field_leave_days, "value": _decimal_to_str(leave_days), "showValue": _decimal_to_str(leave_days)}, {"name": field_leave_days, "value": _decimal_to_str(leave_days), "showValue": _decimal_to_str(leave_days)},
] ]
if field_name: if field_name:
@ -319,14 +322,28 @@ class SyncEhrLeavesToOaMonthJob(BaseJob):
chunk = data_list[i : i + batch_size] chunk = data_list[i : i + batch_size]
if not chunk: if not chunk:
continue continue
try:
resp = seeyon.batch_update_cap4_form_soap( resp = seeyon.batch_update_cap4_form_soap(
formCode=oa_form_code, formCode=oa_form_code,
loginName=oa_login_name, loginName=oa_login_name,
rightId=oa_right_id, rightId=oa_right_id,
dataList=chunk, dataList=chunk,
uniqueFiled=None, uniqueFiled=[field_job_no, field_leave_date],
doTrigger=do_trigger_bool, doTrigger=do_trigger_bool,
) )
except httpx.HTTPStatusError as e:
resp_text = ""
try:
resp_text = str((e.response.text or "")[:2000])
except Exception:
resp_text = ""
first_row = chunk[0] if chunk else {}
raise RuntimeError(
"OA batch-update HTTP error "
f"status={getattr(e.response, 'status_code', None)!r} "
f"body_preview={resp_text!r} "
f"first_row={json.dumps(first_row, ensure_ascii=False, default=str)[:2000]}"
) from e
rj = resp.json() if resp.content else {} rj = resp.json() if resp.content else {}
code_local = int(rj.get("code", -1)) code_local = int(rj.get("code", -1))
if code_local != 0: if code_local != 0: