This commit is contained in:
zlwu committed 2026-08-13 14:31:57 +08:00
1 parent 0e1b750457
commit 8c49021d38
93 files changed
+22731 -12107

No files matched your search

+58
View File
@@ -812,6 +812,64 @@ class TestBuildProgress(unittest.TestCase):
len(terminal), expect_n, f"status={status} terminal count"
)
def test_cancelled_terminal_attributes_to_initiator(self):
"""撤销终态归因发起人;任务 cancelled 仍投影为节点,由前端映射「无需处理」。"""
from app.services.oa_engine import build_progress_items
root = {
"id": "s",
"type": "start",
"child": {
"id": "a1",
"type": "approval",
"name": "直接主管",
"child": {"id": "e1", "type": "end"},
},
}
ts = datetime(2026, 8, 13, 12, 47, 46)
t_pending_cancelled = MagicMock(
id="tA",
node_key="a1",
node_name="直接主管",
task_type="approval",
status="cancelled",
assignee_user_id="u2",
order_num=0,
round_no=1,
create_time=datetime(2026, 8, 13, 11, 17, 38),
update_time=ts,
comment_text=None,
resolve_source="direct_supervisor",
sign_mode="and",
)
inst = MagicMock(
status="cancelled",
initiator_user_id="u0",
current_round=1,
create_time=datetime(2026, 8, 13, 11, 17, 38),
update_time=ts,
)
items = build_progress_items(
inst=inst,
flow_root=root,
tasks=[t_pending_cancelled],
name_map={"u0": "吴子龙", "u2": "张主管"},
events=[],
)
task_card = next(x for x in items if x["kind"] == "task")
self.assertEqual(task_card["title"], "直接主管")
self.assertEqual(task_card["status"], "cancelled")
self.assertEqual(task_card["people"][0]["status"], "cancelled")
self.assertEqual(task_card["timestamp"], "", "cancelled 节点勿带撤销时间")
terminal = next(x for x in items if x["kind"] == "terminal")
self.assertEqual(terminal["status"], "cancelled")
self.assertEqual(terminal["title"], "已撤销")
self.assertEqual(terminal["assigneeUserId"], "u0")
self.assertEqual(terminal["assigneeUserName"], "吴子龙")
self.assertEqual(terminal["commentText"], "发起人撤销")
self.assertTrue(terminal["timestamp"])
def test_progress_returned_has_no_kind_return_node(self):
from app.services.oa_engine import build_progress_items