266 lines
14 KiB
Python
266 lines
14 KiB
Python
#!/usr/bin/env python3
|
||
"""守「我的已办」那一列「当前环节」:摆的是这张单**此刻**停在哪儿,不是我办的那一步。
|
||
|
||
用户提的原话是:已办里那条「流转路由」太窄看不全,而且想看「我批完之后这张单现在到
|
||
哪个环节了」。界面那一半在 ``frontend/src/views/oa/DoneListView.vue``(列宽 + 那一列
|
||
本身,流转路由收进「处理环节」那一格下面),这一篇钉数据那一半::
|
||
|
||
PYTHONPATH=. python3 scripts/check_done_current_step.py
|
||
|
||
1. **读的是现账,不是快照**:``oa_task_completed.current_activity_name`` 只在单据落定
|
||
那一刻整批写一次(``engine._finish_work`` 末尾),引擎每次往前走刷的是**待阅**行,
|
||
在途单的已办行读出来一直是空串。接口按 ``work`` 现问 ``oa_work`` /
|
||
``oa_work_completed``(口径见 ``service/completed.progress``),一行历史都不回填。
|
||
2. **单据一走,那一格跟着走**:同一张单往前一步、换了接手的人,已办那一格当场跟着变。
|
||
3. **落定的单报结局**:归档件上那一份是终点环节名(「结束」),已办那一格里不如
|
||
「办结 / 终止 / 作废」说得明白,接口把流程状态带出来,怎么说交给界面与导出。
|
||
4. **说不清就说不清**:两张单据表都查不着、或者正走在自动环节之间没有人工环节,
|
||
该空的空、该退一步认游标的退一步,不拿旧快照冒充现状。
|
||
5. **一次来回问完一页**:两张表并成一条 ``UNION ALL``,不逐行回查(每接口的语句条数是
|
||
当回归线守着的,见 ``scripts/perf_guard.py``)。
|
||
6. **CSV 与页面一字不差**:「当前环节」插在「环节」右边,屏幕上摆得见、CSV 里就得有。
|
||
|
||
库里不留东西:探针行都挂在合成身份 ``__done_step_*__`` 与合成单据号下,开头与结尾各
|
||
清一遍,中间不 commit。
|
||
"""
|
||
|
||
from __future__ import annotations
|
||
|
||
import csv
|
||
import io
|
||
from datetime import datetime, timedelta
|
||
|
||
from sqlalchemy import delete, event, select
|
||
|
||
from app import models
|
||
from app.api.export import export_tasks
|
||
from app.api.runtime import list_completed
|
||
from app.db import SessionLocal, engine
|
||
from app.deps import CurrentUser
|
||
|
||
STAMP = datetime.now().strftime("%m%d%H%M%S")
|
||
ME = f"__done_step_me_{STAMP}"
|
||
PROCESS = f"done_step_p_{STAMP}"
|
||
BASE = datetime(2026, 1, 1, 9, 0, 0)
|
||
|
||
#: 探针单据号:A 在途(会被往前推一步)、AUTO 停在自动环节、EMPTY 两格都空、
|
||
#: ARCH 已终止归档、GONE 两张表里都没有、CC 挂的是办完的抄送处理那一档
|
||
TAGS = ("A", "AUTO", "EMPTY", "ARCH", "GONE", "CC")
|
||
|
||
FAILS: list[str] = []
|
||
PASSED = 0
|
||
|
||
|
||
def check(label: str, condition, detail: str = "") -> None:
|
||
global PASSED
|
||
if condition:
|
||
PASSED += 1
|
||
print(f"[通过] {label}")
|
||
else:
|
||
FAILS.append(label)
|
||
print(f"[FAIL] {label}" + (f" -> {detail}" if detail else ""))
|
||
|
||
|
||
def work_id(tag: str) -> str:
|
||
return f"done_step_{tag}_{STAMP}"
|
||
|
||
|
||
def serial_of(tag: str) -> str:
|
||
return f"STEP{tag}{STAMP}"
|
||
|
||
|
||
def purge() -> None:
|
||
"""清掉探针行(也包括上一次跑挂了留下的)。"""
|
||
with SessionLocal() as db:
|
||
ids = [work_id(tag) for tag in TAGS]
|
||
db.execute(delete(models.TaskCompleted).where(models.TaskCompleted.identity == ME))
|
||
db.execute(delete(models.ReadCompleted).where(models.ReadCompleted.identity == ME))
|
||
db.execute(delete(models.Work).where(models.Work.id.in_(ids)))
|
||
db.execute(delete(models.WorkCompleted).where(models.WorkCompleted.id.in_(ids)))
|
||
db.commit()
|
||
|
||
|
||
def add_approval(db, tag: str, minutes: int, activity: str, *, stale: str = "") -> None:
|
||
"""插一条环节上的表态。``stale`` 是行上那份旧快照,用来证明接口不读它。"""
|
||
moment = BASE + timedelta(minutes=minutes)
|
||
db.add(models.TaskCompleted(
|
||
task=f"task-{tag}-{STAMP}", job=f"job-{tag}-{STAMP}", work=work_id(tag),
|
||
title=f"当前环节校验单-{tag}", process=PROCESS, process_name=f"当前环节校验流程-{STAMP}",
|
||
serial=serial_of(tag), activity=f"act-{activity}", activity_name=activity,
|
||
current_activity_name=stale, person="me", identity=ME, identity_name="当前环节校验账号",
|
||
creator_person="张三", start_time=moment - timedelta(minutes=1), completed_time=moment,
|
||
latest=True))
|
||
|
||
|
||
def add_running(db, tag: str, *, names: str, cursor: str = "", handlers: str = "",
|
||
paused: bool = False) -> models.Work:
|
||
"""插一张还在走的单:「当前环节」那一格读的就是它。"""
|
||
row = models.Work(
|
||
id=work_id(tag), job=f"job-{tag}-{STAMP}", serial=serial_of(tag),
|
||
title=f"当前环节校验单-{tag}", status="running", process=PROCESS,
|
||
process_name=f"当前环节校验流程-{STAMP}", creator_person="张三",
|
||
current_activity_names=names, activity_name=cursor, manual_identity_text=handlers,
|
||
paused=paused, start_time=BASE)
|
||
db.add(row)
|
||
return row
|
||
|
||
|
||
def add_archived(db, tag: str, *, status: str, names: str) -> None:
|
||
"""插一张落定的单(办结 / 终止那一刻整行搬进 ``oa_work_completed``)。"""
|
||
db.add(models.WorkCompleted(
|
||
id=work_id(tag), job=f"job-{tag}-{STAMP}", serial=serial_of(tag),
|
||
title=f"当前环节校验单-{tag}", status=status, process=PROCESS,
|
||
process_name=f"当前环节校验流程-{STAMP}", creator_person="张三",
|
||
current_activity_names=names, start_time=BASE, finish_time=BASE + timedelta(hours=3)))
|
||
|
||
|
||
def add_cc_done(db, tag: str, minutes: int) -> None:
|
||
"""插一条办完的「抄送需处理」:那一行也说得出这张单现在到哪儿了。
|
||
|
||
``oa_read_completed`` 压根没有 ``current_activity_name`` 这一列(待阅归档表少这一格),
|
||
``serializers.read_completed_as_done`` 那一句 ``getattr`` 一直回空串——这一档的
|
||
「当前环节」全靠接口现问,正好是最干净的一个证据。
|
||
"""
|
||
moment = BASE + timedelta(minutes=minutes)
|
||
db.add(models.ReadCompleted(
|
||
read=f"read-{tag}-{STAMP}", job=f"job-{tag}-{STAMP}", work=work_id(tag),
|
||
title=f"当前环节校验单-{tag}", process=PROCESS, process_name=f"当前环节校验流程-{STAMP}",
|
||
serial=serial_of(tag), activity="act-cc", activity_name="财务复核",
|
||
person="me", identity=ME, identity_name="当前环节校验账号",
|
||
sender="李四", creator_person="张三", read_type="cc", requires_action=True,
|
||
opinion="已核对", start_time=moment - timedelta(hours=1), view_time=moment,
|
||
handle_time=moment))
|
||
|
||
|
||
def done_rows(db, user) -> list[dict]:
|
||
return list_completed(
|
||
user=user, db=db, keyword="", process="", category="",
|
||
start_date="", end_date="", page=1, page_size=50,
|
||
)["data"]["items"]
|
||
|
||
|
||
def row_of(items: list[dict], tag: str, source: str = "") -> dict:
|
||
"""按探针编号取那一行;``source`` 用来在同一张单的两档来源之间分清楚。"""
|
||
for item in items:
|
||
if item.get("work") != work_id(tag):
|
||
continue
|
||
if source and item.get("done_source") != source:
|
||
continue
|
||
return item
|
||
raise AssertionError(f"探针 {tag}({source}) 没出现在已办里:{[i.get('work') for i in items]}")
|
||
|
||
|
||
def done_csv(db, user) -> tuple[list[str], list[list[str]]]:
|
||
body = export_tasks(
|
||
scope="completed", keyword="", process="", category="", expired="",
|
||
start_date="", end_date="", db=db, user=user,
|
||
).body.decode("utf-8-sig")
|
||
lines = list(csv.reader(io.StringIO(body)))
|
||
return lines[0], lines[1:]
|
||
|
||
|
||
def main() -> int:
|
||
purge()
|
||
with SessionLocal() as db:
|
||
person = db.execute(select(models.User).limit(1)).scalars().first()
|
||
if person is None:
|
||
print("[FAIL] 库里没有任何 users 行,造不出 CurrentUser")
|
||
return 1
|
||
user = CurrentUser(person=person, ref=ME, is_admin=True)
|
||
add_running(db, "A", names="部门主管", handlers="王主管")
|
||
add_running(db, "AUTO", names="", cursor="财务初审")
|
||
add_running(db, "EMPTY", names="")
|
||
add_running(db, "CC", names="总经理", handlers="李总")
|
||
add_archived(db, "ARCH", status="terminated", names="结束")
|
||
for index, tag in enumerate(("A", "AUTO", "EMPTY", "ARCH", "GONE")):
|
||
add_approval(db, tag, 300 - index * 10, "发起申请",
|
||
stale="发起申请" if tag in {"A", "GONE"} else "")
|
||
add_cc_done(db, "CC", 420)
|
||
db.flush()
|
||
|
||
items = done_rows(db, user)
|
||
check("六条探针都摆在这一屏里(这一篇只盯那一格,不动折叠口径)",
|
||
len(items) == len(TAGS), str([i.get("work") for i in items]))
|
||
|
||
row_a = row_of(items, "A", "approval")
|
||
check("在途的已办带出「此刻停在哪个环节」,读的是单据本尊,不是行上那份旧快照",
|
||
row_a.get("work_status") == "running"
|
||
and row_a.get("current_activity_name") == "部门主管", str(sorted(row_a)))
|
||
check("当前处理人跟着带出来(界面那一格下面那行小字就是它)",
|
||
row_a.get("current_handlers") == "王主管", str(row_a.get("current_handlers")))
|
||
check("没挂起的单不谎报挂起", row_a.get("work_paused") is False,
|
||
str(row_a.get("work_paused")))
|
||
|
||
# 同一张单往前走一格(引擎改的就是 oa_work 那两列):已办那一格当场跟着走
|
||
running_a = db.get(models.Work, work_id("A"))
|
||
running_a.current_activity_names = "总经理"
|
||
running_a.manual_identity_text = "李总"
|
||
db.flush()
|
||
moved = row_of(done_rows(db, user), "A", "approval")
|
||
check("单据往前走一步,那一格不用回填、当场跟着变成新环节与新接手的人",
|
||
moved.get("current_activity_name") == "总经理"
|
||
and moved.get("current_handlers") == "李总", str(sorted(moved)))
|
||
running_a.paused = True
|
||
db.flush()
|
||
check("被挂起的那张单也说得出自己冻住了(仍算在途,不是另一种结局)",
|
||
row_of(done_rows(db, user), "A", "approval").get("work_paused") is True, "")
|
||
running_a.paused = False
|
||
db.flush()
|
||
|
||
items = done_rows(db, user)
|
||
check("停在自动环节上没有人工环节:退一步认游标那一格,不摆空",
|
||
row_of(items, "AUTO").get("current_activity_name") == "财务初审",
|
||
str(row_of(items, "AUTO")))
|
||
check("游标与当前环节都是空就说不知道,不拿行上那份快照冒充现状",
|
||
row_of(items, "EMPTY").get("work_status") == "running"
|
||
and not row_of(items, "EMPTY").get("current_activity_name"),
|
||
str(row_of(items, "EMPTY")))
|
||
check("落定的单带出的是流程状态(terminated),界面据此写「已终止」而非「结束」",
|
||
row_of(items, "ARCH").get("work_status") == "terminated", str(row_of(items, "ARCH")))
|
||
gone = row_of(items, "GONE")
|
||
check("两张单据表都查不着的那条不猜:状态给空串,行上那份快照留着不抹",
|
||
gone.get("work_status") == "" and gone.get("current_activity_name") == "发起申请"
|
||
and gone.get("current_handlers") == "", str(sorted(gone)))
|
||
cc = row_of(items, "CC", "cc")
|
||
check("抄送处理那一行也说得出这张单现在到哪儿了(归档表压根没那一列,只可能是现问的)",
|
||
cc.get("work_status") == "running"
|
||
and cc.get("current_activity_name") == "总经理"
|
||
and cc.get("current_handlers") == "李总", str(sorted(cc)))
|
||
|
||
# 一次来回问完一页:两张表并成一条 UNION ALL,不逐行回查
|
||
seen: list[str] = []
|
||
listener = lambda *args, **kwargs: seen.append(str(args[2])) # noqa: E731
|
||
event.listen(engine, "before_cursor_execute", listener)
|
||
try:
|
||
done_rows(db, user)
|
||
finally:
|
||
event.remove(engine, "before_cursor_execute", listener)
|
||
probes = [sql for sql in seen if "oa_work_completed" in sql and "UNION ALL" in sql.upper()]
|
||
check("一页单据一次来回问完(一条 UNION ALL,不逐行回查)",
|
||
len(probes) == 1, f"{len(probes)} 条:{probes}")
|
||
|
||
header, lines = done_csv(db, user)
|
||
check("CSV 有「当前环节」这一列,且紧挨在「环节」右边",
|
||
"当前环节" in header and header.index("当前环节") == header.index("环节") + 1,
|
||
str(header))
|
||
check("CSV 每行的格数与表头一致(少一格会把后面整排的列名往左挪一位)",
|
||
all(len(line) == len(header) for line in lines),
|
||
str([len(line) for line in lines]))
|
||
cells = {str(line[header.index("单号")]): line[header.index("当前环节")] for line in lines}
|
||
check("CSV 那几格与界面同一个答案:在途报环节,落定报结局",
|
||
cells.get(serial_of("A")) == "总经理" and cells.get(serial_of("ARCH")) == "终止",
|
||
str(cells))
|
||
check("自动环节那一张退到游标那一格,CSV 里也一样",
|
||
cells.get(serial_of("AUTO")) == "财务初审", str(cells))
|
||
check("查不着的那张单在 CSV 里留空,不拿旧快照糊弄",
|
||
cells.get(serial_of("GONE")) == "", str(cells))
|
||
db.rollback()
|
||
purge()
|
||
print()
|
||
print(f"通过 {PASSED} 项,失败 {len(FAILS)} 项")
|
||
return 1 if FAILS else 0
|
||
|
||
|
||
if __name__ == "__main__":
|
||
raise SystemExit(main())
|