feat(pl): bind sys user on personnel and snapshot selectedEscortId
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
0658090223
commit
26b096ae38
6 files changed
+108
-1
No files matched your search
@@ -68,6 +68,7 @@ from app.services.pl_personnel_service import (
|
||||
load_vehicle_personnel_summaries,
|
||||
save_vehicle_personnel,
|
||||
)
|
||||
from app.services.pl_personnel_user_bind import assert_sys_user_bind_available
|
||||
from app.schemas.pl.paste_recognize import PasteCommitBody, PasteCommitResult
|
||||
from app.services.pl_paste_recognize_service import commit_paste_recognize
|
||||
|
||||
@@ -865,6 +866,35 @@ def _personnel_to_read(
|
||||
return data
|
||||
|
||||
|
||||
def _assert_personnel_sys_user_bind(
|
||||
db: Session,
|
||||
tenant_no: str,
|
||||
*,
|
||||
personnel_id: str,
|
||||
sys_user_id: Optional[str],
|
||||
) -> None:
|
||||
uid = (sys_user_id or "").strip()
|
||||
if not uid:
|
||||
return
|
||||
existing = (
|
||||
db.query(PlPersonnel)
|
||||
.filter(
|
||||
PlPersonnel.tenant_no == tenant_no,
|
||||
PlPersonnel.sys_user_id == uid,
|
||||
PlPersonnel.del_flag == 0,
|
||||
)
|
||||
.all()
|
||||
)
|
||||
try:
|
||||
assert_sys_user_bind_available(
|
||||
existing=existing,
|
||||
personnel_id=personnel_id,
|
||||
sys_user_id=uid,
|
||||
)
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=400, detail=str(exc)) from exc
|
||||
|
||||
|
||||
def _personnel_to_detail(
|
||||
db: Session, tenant_no: str, personnel: PlPersonnel
|
||||
) -> PersonnelDetailRead:
|
||||
@@ -1083,8 +1113,16 @@ def create_personnel(
|
||||
subject_label=f"「{payload.personnel_name}」",
|
||||
)
|
||||
|
||||
personnel_id = generate_uuid()
|
||||
_assert_personnel_sys_user_bind(
|
||||
db,
|
||||
tenant_no,
|
||||
personnel_id=personnel_id,
|
||||
sys_user_id=payload.sys_user_id,
|
||||
)
|
||||
|
||||
personnel = PlPersonnel(
|
||||
id=generate_uuid(),
|
||||
id=personnel_id,
|
||||
tenant_no=tenant_no,
|
||||
personnel_name=payload.personnel_name,
|
||||
phone_no=payload.phone_no,
|
||||
@@ -1094,6 +1132,7 @@ def create_personnel(
|
||||
personnel_affiliation=payload.personnel_affiliation,
|
||||
status=payload.status,
|
||||
photo_urls=payload.photo_urls,
|
||||
sys_user_id=(payload.sys_user_id or "").strip() or None,
|
||||
remark=payload.remark,
|
||||
create_by=user.id,
|
||||
create_dept_id=user.dept_id,
|
||||
@@ -1162,6 +1201,16 @@ def update_personnel(
|
||||
subject_label=f"「{subject_name}」",
|
||||
)
|
||||
|
||||
if "sys_user_id" in data:
|
||||
raw_uid = data.get("sys_user_id")
|
||||
data["sys_user_id"] = (raw_uid or "").strip() or None
|
||||
_assert_personnel_sys_user_bind(
|
||||
db,
|
||||
tenant_no,
|
||||
personnel_id=personnel.id,
|
||||
sys_user_id=data["sys_user_id"],
|
||||
)
|
||||
|
||||
for key, value in data.items():
|
||||
setattr(personnel, key, value)
|
||||
|
||||
|
||||
Reference in new issue
Block a user