填写弹窗未落结论时默认任务状态已完成、结论通过(实验室与第三方); 每次保存追加操作留痕,卡片可查看修改时间线。关联 #148 #149。 Co-authored-by: Cursor <cursoragent@cursor.com>
251 lines
7.6 KiB
Python
251 lines
7.6 KiB
Python
"""质检任务检测结果操作留痕"""
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from datetime import datetime
|
|
from typing import Any, Dict, List, Optional
|
|
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.core.utils import generate_uuid
|
|
from app.models.models import BizQcTask, BizQcTaskResultChangeLog, SysUser
|
|
from app.models.qc_param import BizQcTaskResult
|
|
|
|
_TASK_STATUS_LABELS = {"dzx": "待执行", "jxz": "进行中", "ywc": "已完成"}
|
|
_CONCLUSION_LABELS = {"": "待结论", "tg": "通过", "btg": "不通过"}
|
|
|
|
|
|
def _fmt_dt(v: Optional[datetime]) -> str:
|
|
if not v:
|
|
return ""
|
|
return v.strftime("%Y-%m-%d %H:%M:%S")
|
|
|
|
|
|
def _display_status(code: Optional[str]) -> str:
|
|
c = (code or "").strip()
|
|
return _TASK_STATUS_LABELS.get(c, c or "—")
|
|
|
|
|
|
def _display_conclusion(code: Optional[str]) -> str:
|
|
c = (code or "").strip()
|
|
return _CONCLUSION_LABELS.get(c, c or "待结论")
|
|
|
|
|
|
def _norm_text(v: Any) -> str:
|
|
if v is None:
|
|
return ""
|
|
return str(v).strip()
|
|
|
|
|
|
def _param_key(param_id: Optional[str], param_code: Optional[str], param_name: Optional[str]) -> str:
|
|
pid = _norm_text(param_id)
|
|
if pid:
|
|
return f"paramId:{pid}"
|
|
code = _norm_text(param_code)
|
|
if code:
|
|
return f"paramCode:{code}"
|
|
return f"paramName:{_norm_text(param_name)}"
|
|
|
|
|
|
def snapshot_task_result_state(db: Session, task: BizQcTask, tenant_no: str) -> Dict[str, Any]:
|
|
"""保存前快照:任务结论字段 + 已存参数值。"""
|
|
rows = (
|
|
db.query(BizQcTaskResult)
|
|
.filter(
|
|
BizQcTaskResult.task_id == task.id,
|
|
BizQcTaskResult.tenant_no == tenant_no,
|
|
BizQcTaskResult.del_flag == 0,
|
|
)
|
|
.order_by(BizQcTaskResult.create_time.asc())
|
|
.all()
|
|
)
|
|
params: Dict[str, Dict[str, str]] = {}
|
|
for r in rows:
|
|
key = _param_key(r.param_id, r.param_code, r.param_name)
|
|
params[key] = {
|
|
"label": _norm_text(r.param_name) or key,
|
|
"value": _norm_text(r.param_value),
|
|
}
|
|
return {
|
|
"taskStatus": _norm_text(task.task_status),
|
|
"conclusion": _norm_text(task.conclusion),
|
|
"remark": _norm_text(task.remark),
|
|
"attachments": _norm_text(task.third_party_attachments),
|
|
"params": params,
|
|
}
|
|
|
|
|
|
def build_result_changes(
|
|
before: Dict[str, Any],
|
|
after: Dict[str, Any],
|
|
) -> List[Dict[str, str]]:
|
|
changes: List[Dict[str, str]] = []
|
|
|
|
def add(field_key: str, label: str, old_v: str, new_v: str) -> None:
|
|
if old_v == new_v:
|
|
return
|
|
changes.append(
|
|
{
|
|
"fieldKey": field_key,
|
|
"fieldLabel": label,
|
|
"oldValue": old_v,
|
|
"newValue": new_v,
|
|
}
|
|
)
|
|
|
|
add(
|
|
"taskStatus",
|
|
"任务状态",
|
|
_display_status(before.get("taskStatus")),
|
|
_display_status(after.get("taskStatus")),
|
|
)
|
|
add(
|
|
"conclusion",
|
|
"结论",
|
|
_display_conclusion(before.get("conclusion")),
|
|
_display_conclusion(after.get("conclusion")),
|
|
)
|
|
add("remark", "备注", _norm_text(before.get("remark")), _norm_text(after.get("remark")))
|
|
add(
|
|
"attachments",
|
|
"检测材料",
|
|
_norm_text(before.get("attachments")),
|
|
_norm_text(after.get("attachments")),
|
|
)
|
|
|
|
before_params: Dict[str, Dict[str, str]] = before.get("params") or {}
|
|
after_params: Dict[str, Dict[str, str]] = after.get("params") or {}
|
|
keys = sorted(set(before_params.keys()) | set(after_params.keys()))
|
|
for key in keys:
|
|
b = before_params.get(key) or {"label": key, "value": ""}
|
|
a = after_params.get(key) or {"label": b.get("label") or key, "value": ""}
|
|
label = _norm_text(a.get("label")) or _norm_text(b.get("label")) or key
|
|
add(key, label, _norm_text(b.get("value")), _norm_text(a.get("value")))
|
|
return changes
|
|
|
|
|
|
def _resolve_operator_name(db: Session, user_id: Optional[str], fallback: str = "") -> str:
|
|
uid = _norm_text(user_id)
|
|
if not uid:
|
|
return _norm_text(fallback)
|
|
row = db.query(SysUser.nick_name).filter(SysUser.id == uid).first()
|
|
if row and row[0]:
|
|
return str(row[0]).strip()
|
|
return _norm_text(fallback) or uid
|
|
|
|
|
|
def append_task_result_change_log(
|
|
db: Session,
|
|
*,
|
|
task: BizQcTask,
|
|
tenant_no: str,
|
|
user_id: Optional[str],
|
|
operator_user_name: str = "",
|
|
before: Dict[str, Any],
|
|
after: Dict[str, Any],
|
|
operate_time: Optional[datetime] = None,
|
|
) -> BizQcTaskResultChangeLog:
|
|
"""追加一条检测结果保存留痕(不 commit)。无字段差异也写入。"""
|
|
now = operate_time or datetime.now()
|
|
changes = build_result_changes(before, after)
|
|
has_change = "1" if changes else "0"
|
|
name = _resolve_operator_name(db, user_id, operator_user_name)
|
|
obj = BizQcTaskResultChangeLog(
|
|
id=generate_uuid(),
|
|
task_id=task.id,
|
|
work_order_id=_norm_text(task.work_order_id) or None,
|
|
sample_code=_norm_text(task.sample_code) or None,
|
|
item_name=_norm_text(task.item_name) or None,
|
|
operate_time=now,
|
|
operator_user_id=user_id,
|
|
operator_user_name=name or None,
|
|
has_field_change=has_change,
|
|
changes_json=json.dumps(changes, ensure_ascii=False),
|
|
tenant_no=tenant_no,
|
|
order_num=0,
|
|
remark=None,
|
|
create_by=user_id,
|
|
create_dept_id="",
|
|
create_time=now,
|
|
update_by=user_id,
|
|
update_time=now,
|
|
del_flag=0,
|
|
)
|
|
db.add(obj)
|
|
return obj
|
|
|
|
|
|
def _row_to_dict(row: BizQcTaskResultChangeLog) -> Dict[str, Any]:
|
|
changes: List[Dict[str, Any]] = []
|
|
raw = row.changes_json or ""
|
|
if raw.strip():
|
|
try:
|
|
parsed = json.loads(raw)
|
|
if isinstance(parsed, list):
|
|
changes = parsed
|
|
except json.JSONDecodeError:
|
|
changes = []
|
|
return {
|
|
"id": row.id,
|
|
"taskId": row.task_id,
|
|
"workOrderId": row.work_order_id or "",
|
|
"sampleCode": row.sample_code or "",
|
|
"itemName": row.item_name or "",
|
|
"operateTime": _fmt_dt(row.operate_time),
|
|
"operatorUserId": row.operator_user_id or "",
|
|
"operatorUserName": row.operator_user_name or "",
|
|
"hasFieldChange": row.has_field_change == "1",
|
|
"changes": changes,
|
|
"createTime": _fmt_dt(row.create_time),
|
|
}
|
|
|
|
|
|
def list_task_result_change_logs(
|
|
db: Session,
|
|
*,
|
|
task_id: str,
|
|
tenant_no: str,
|
|
) -> List[Dict[str, Any]]:
|
|
tid = _norm_text(task_id)
|
|
if not tid:
|
|
return []
|
|
rows = (
|
|
db.query(BizQcTaskResultChangeLog)
|
|
.filter(
|
|
BizQcTaskResultChangeLog.task_id == tid,
|
|
BizQcTaskResultChangeLog.tenant_no == tenant_no,
|
|
BizQcTaskResultChangeLog.del_flag == 0,
|
|
)
|
|
.order_by(
|
|
BizQcTaskResultChangeLog.operate_time.desc(),
|
|
BizQcTaskResultChangeLog.create_time.desc(),
|
|
)
|
|
.all()
|
|
)
|
|
return [_row_to_dict(r) for r in rows]
|
|
|
|
|
|
def list_task_result_change_logs_by_task_ids(
|
|
db: Session,
|
|
*,
|
|
task_ids: List[str],
|
|
tenant_no: str,
|
|
) -> List[Dict[str, Any]]:
|
|
ids = [_norm_text(x) for x in task_ids if _norm_text(x)]
|
|
if not ids:
|
|
return []
|
|
rows = (
|
|
db.query(BizQcTaskResultChangeLog)
|
|
.filter(
|
|
BizQcTaskResultChangeLog.task_id.in_(ids),
|
|
BizQcTaskResultChangeLog.tenant_no == tenant_no,
|
|
BizQcTaskResultChangeLog.del_flag == 0,
|
|
)
|
|
.order_by(
|
|
BizQcTaskResultChangeLog.operate_time.desc(),
|
|
BizQcTaskResultChangeLog.create_time.desc(),
|
|
)
|
|
.all()
|
|
)
|
|
return [_row_to_dict(r) for r in rows]
|