feat(oa): add return, resubmit, and multi-round approval progress
Align with DingTalk semantics: reject ends the instance, return keeps it for initiator edits, and revoke-and-resubmit creates a linked new instance. Progress timeline projects rounds via oa_instance_event. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
265d790ea6
commit
26800865cd
13 files changed
+4736
-72
No files matched your search
@@ -243,13 +243,14 @@ class TestCompleteTaskOrSign(unittest.TestCase):
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from app.core.database import Base
|
||||
from app.models.models import OaAppVersion, OaInstance, OaTask
|
||||
from app.models.models import OaAppVersion, OaInstance, OaInstanceEvent, OaTask
|
||||
|
||||
self.engine = create_engine("sqlite:///:memory:")
|
||||
# 仅建引擎相关表
|
||||
OaAppVersion.__table__.create(self.engine)
|
||||
OaInstance.__table__.create(self.engine)
|
||||
OaTask.__table__.create(self.engine)
|
||||
OaInstanceEvent.__table__.create(self.engine)
|
||||
Session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
|
||||
self.db = Session()
|
||||
self.Base = Base
|
||||
@@ -429,6 +430,7 @@ class TestBuildProgress(unittest.TestCase):
|
||||
status="pending",
|
||||
assignee_user_id="u2",
|
||||
order_num=0,
|
||||
round_no=1,
|
||||
create_time=ts,
|
||||
update_time=ts,
|
||||
comment_text=None,
|
||||
@@ -442,6 +444,7 @@ class TestBuildProgress(unittest.TestCase):
|
||||
status="done",
|
||||
assignee_user_id="u9",
|
||||
order_num=0,
|
||||
round_no=1,
|
||||
create_time=ts,
|
||||
update_time=ts,
|
||||
comment_text=None,
|
||||
@@ -450,6 +453,7 @@ class TestBuildProgress(unittest.TestCase):
|
||||
inst = MagicMock(
|
||||
status="running",
|
||||
initiator_user_id="u0",
|
||||
current_round=1,
|
||||
create_time=ts,
|
||||
update_time=ts,
|
||||
)
|
||||
@@ -498,6 +502,7 @@ class TestBuildProgress(unittest.TestCase):
|
||||
status="rejected",
|
||||
assignee_user_id="u2",
|
||||
order_num=0,
|
||||
round_no=1,
|
||||
create_time=ts,
|
||||
update_time=ts,
|
||||
comment_text="不同意",
|
||||
@@ -507,6 +512,7 @@ class TestBuildProgress(unittest.TestCase):
|
||||
inst = MagicMock(
|
||||
status=status,
|
||||
initiator_user_id="u0",
|
||||
current_round=1,
|
||||
create_time=ts,
|
||||
update_time=ts,
|
||||
)
|
||||
@@ -523,6 +529,156 @@ class TestBuildProgress(unittest.TestCase):
|
||||
self.assertEqual(len(terminal), 1, f"status={status} should have one terminal")
|
||||
|
||||
|
||||
class TestReturnAndResubmit(unittest.TestCase):
|
||||
def setUp(self):
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from app.models.models import OaAppVersion, OaInstance, OaInstanceEvent, OaTask
|
||||
|
||||
self.engine = create_engine("sqlite:///:memory:")
|
||||
OaAppVersion.__table__.create(self.engine)
|
||||
OaInstance.__table__.create(self.engine)
|
||||
OaTask.__table__.create(self.engine)
|
||||
OaInstanceEvent.__table__.create(self.engine)
|
||||
Session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
|
||||
self.db = Session()
|
||||
self.OaInstance = OaInstance
|
||||
self.OaTask = OaTask
|
||||
self.OaInstanceEvent = OaInstanceEvent
|
||||
|
||||
flow = {
|
||||
"id": "s",
|
||||
"type": "start",
|
||||
"child": {
|
||||
"id": "a1",
|
||||
"type": "approval",
|
||||
"name": "审批人",
|
||||
"approverConfig": {
|
||||
"assigneeType": "users",
|
||||
"userIds": ["u1"],
|
||||
"signMode": "or",
|
||||
},
|
||||
"child": {"id": "e1", "type": "end"},
|
||||
},
|
||||
}
|
||||
now = datetime.now()
|
||||
self.db.add(
|
||||
OaAppVersion(
|
||||
id="v1",
|
||||
app_id="app1",
|
||||
version_no=1,
|
||||
status="published",
|
||||
is_latest_published="1",
|
||||
form_schema_json="{}",
|
||||
flow_tree_json=json.dumps(flow),
|
||||
advanced_settings_json=json.dumps({"allowReturn": True}),
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
OaInstance(
|
||||
id="i1",
|
||||
app_id="app1",
|
||||
app_version_id="v1",
|
||||
title="打回测",
|
||||
initiator_user_id="u0",
|
||||
initiator_dept_id="d1",
|
||||
form_data_json="{}",
|
||||
status="running",
|
||||
current_round=1,
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
OaTask(
|
||||
id="t1",
|
||||
instance_id="i1",
|
||||
node_key="a1",
|
||||
node_name="审批人",
|
||||
task_type="approval",
|
||||
assignee_user_id="u1",
|
||||
status="pending",
|
||||
sign_mode="or",
|
||||
round_no=1,
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.commit()
|
||||
|
||||
def tearDown(self):
|
||||
self.db.close()
|
||||
self.engine.dispose()
|
||||
|
||||
def test_return_sets_returned_and_event(self):
|
||||
from app.services.oa_engine import return_task
|
||||
|
||||
with patch(
|
||||
"app.services.oa_engine.get_instance_detail",
|
||||
return_value={"id": "i1", "status": "returned"},
|
||||
):
|
||||
return_task(
|
||||
self.db, "t1", tenant_no="zkxw", user_id="u1", comment="请补充材料"
|
||||
)
|
||||
inst = self.db.query(self.OaInstance).filter_by(id="i1").first()
|
||||
task = self.db.query(self.OaTask).filter_by(id="t1").first()
|
||||
ev = (
|
||||
self.db.query(self.OaInstanceEvent)
|
||||
.filter_by(instance_id="i1", event_type="return")
|
||||
.first()
|
||||
)
|
||||
self.assertEqual(inst.status, "returned")
|
||||
self.assertEqual(task.status, "returned")
|
||||
self.assertIsNotNone(ev)
|
||||
self.assertEqual(ev.comment_text, "请补充材料")
|
||||
|
||||
def test_resubmit_starts_new_round(self):
|
||||
from app.services.oa_engine import resubmit_instance, return_task
|
||||
|
||||
with patch(
|
||||
"app.services.oa_engine.get_instance_detail",
|
||||
return_value={"id": "i1", "status": "returned"},
|
||||
):
|
||||
return_task(
|
||||
self.db, "t1", tenant_no="zkxw", user_id="u1", comment="请补充材料"
|
||||
)
|
||||
|
||||
fake_task = MagicMock()
|
||||
with patch(
|
||||
"app.services.oa_engine._create_tasks_for_node", return_value=[fake_task]
|
||||
), patch(
|
||||
"app.services.oa_engine.get_instance_detail",
|
||||
return_value={"id": "i1", "status": "running"},
|
||||
):
|
||||
resubmit_instance(
|
||||
self.db,
|
||||
"i1",
|
||||
tenant_no="zkxw",
|
||||
user_id="u0",
|
||||
form_data={"x": 1},
|
||||
)
|
||||
inst = self.db.query(self.OaInstance).filter_by(id="i1").first()
|
||||
self.assertEqual(inst.status, "running")
|
||||
self.assertEqual(inst.current_round, 2)
|
||||
submit_ev = (
|
||||
self.db.query(self.OaInstanceEvent)
|
||||
.filter_by(instance_id="i1", event_type="submit", round_no=2)
|
||||
.first()
|
||||
)
|
||||
self.assertIsNotNone(submit_ev)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
Reference in new issue
Block a user