feat(qc): 检测结果默认已完成/通过并记录修改历史
填写弹窗未落结论时默认任务状态已完成、结论通过(实验室与第三方); 每次保存追加操作留痕,卡片可查看修改时间线。关联 #148 #149。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
8d7b2ada59
commit
9b6228860f
10 files changed
+740
-23
No files matched your search
@@ -29,6 +29,7 @@ from app.crud import qc_lab_test_item as lab_svc
|
||||
from app.crud import qc_inspection_item_template as iit_svc
|
||||
from app.crud import qc_item_param as param_svc
|
||||
from app.crud import qc_task_result as result_svc
|
||||
from app.crud import qc_task_result_change_log as result_change_log_svc
|
||||
from app.crud import qc_task as task_svc
|
||||
from app.crud import qc_third_party_company as tpc_svc
|
||||
from app.crud import qc_third_party_item as tpi_svc
|
||||
@@ -1349,6 +1350,48 @@ async def get_task_material_usages(
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.get("/qc-tasks/result-change-logs")
|
||||
async def list_qc_task_result_change_logs_batch(
|
||||
taskIds: str = Query(..., description="逗号分隔的任务ID"),
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_any_menu_code(*QC_TASK_READONLY_MENU_CODES)),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
ids = [x.strip() for x in (taskIds or "").split(",") if x.strip()]
|
||||
return success_response(
|
||||
result_change_log_svc.list_task_result_change_logs_by_task_ids(
|
||||
db, task_ids=ids, tenant_no=tenant_no
|
||||
)
|
||||
)
|
||||
except PermissionError as e:
|
||||
return error_response(403, str(e))
|
||||
except Exception as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.get("/qc-tasks/{task_id}/result-change-logs")
|
||||
async def list_qc_task_result_change_logs(
|
||||
task_id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_any_menu_code(*QC_TASK_READONLY_MENU_CODES)),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
t = task_svc.get_task(db, task_id, tenant_no=tenant_no)
|
||||
if not t:
|
||||
return error_response(404, "任务不存在")
|
||||
return success_response(
|
||||
result_change_log_svc.list_task_result_change_logs(
|
||||
db, task_id=task_id, tenant_no=tenant_no
|
||||
)
|
||||
)
|
||||
except PermissionError as e:
|
||||
return error_response(403, str(e))
|
||||
except Exception as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.post("/qc-tasks/{task_id}/complete-with-result")
|
||||
async def complete_task_with_result(
|
||||
task_id: str,
|
||||
@@ -1364,6 +1407,7 @@ async def complete_task_with_result(
|
||||
if not t:
|
||||
return error_response(404, "任务不存在")
|
||||
was_done = (t.task_status or "").strip() == "ywc"
|
||||
before = result_change_log_svc.snapshot_task_result_state(db, t, tenant_no)
|
||||
if body.results:
|
||||
result_svc.save_results_for_task(
|
||||
db, task_id, body.results, tenant_no, user_id, commit=False,
|
||||
@@ -1384,6 +1428,16 @@ async def complete_task_with_result(
|
||||
task_status=body.task_status,
|
||||
commit=False,
|
||||
)
|
||||
after = result_change_log_svc.snapshot_task_result_state(db, obj, tenant_no)
|
||||
result_change_log_svc.append_task_result_change_log(
|
||||
db,
|
||||
task=obj,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
operator_user_name=str(user.get("nickName") or user.get("nick_name") or ""),
|
||||
before=before,
|
||||
after=after,
|
||||
)
|
||||
db.commit()
|
||||
db.refresh(obj)
|
||||
if (obj.task_status or "").strip() == "ywc":
|
||||
|
||||
Reference in new issue
Block a user