diff --git a/db/流程图导入后初始sql.sql b/db/流程图导入后初始sql.sql index 9c3e2b7b..61150944 100644 --- a/db/流程图导入后初始sql.sql +++ b/db/流程图导入后初始sql.sql @@ -61,7 +61,7 @@ where process_definition_id like 'standard-assessment:%'; update process_node set is_skip = 1 where process_definition_id like 'project-assessment:%' - and xml_node_id in ('mkfzrxg'); + and xml_node_id in ('mkfzrxg','mkfzrff','sjgcspg','mkfzrsp'); # 更新是否可选人 update process_node set can_choose = 0 diff --git a/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn b/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn index 20c75320..2dbfd585 100644 --- a/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn +++ b/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn @@ -1,368 +1,369 @@ - - - Flow_12b9yhd + + + Flow_12b9yhd + + + Flow_12b9yhd + Flow_0tgn37q + + + Flow_0tgn37q + Flow_0w3nr57 + + ${nrOfInstances == nrOfCompletedInstances} + + + Flow_1g6zc95 - - Flow_12b9yhd - Flow_0tgn37q + + Flow_1g6zc95 + Flow_01dzmhe - - Flow_0tgn37q - Flow_0w3nr57 - + + Flow_0ql7uu4 + Flow_1o0npc9 + ${nrOfInstances == nrOfCompletedInstances} - - Flow_1g6zc95 + + Flow_0xb4gtd - - Flow_1g6zc95 - Flow_01dzmhe - - - Flow_0ql7uu4 - Flow_1o0npc9 - - ${nrOfInstances == nrOfCompletedInstances} - - - Flow_0xb4gtd - - - Flow_1qgrfu1 - - - Flow_0cx9yoz - Flow_1d18hwv - Flow_1g6f2ww - - - Flow_1g6f2ww - - - - - - Flow_0xb4gtd - Flow_0cx9yoz - - - Flow_1d18hwv - Flow_1qgrfu1 - - ${nrOfInstances == nrOfCompletedInstances} - - - Flow_1fanjtp - - - - - - Flow_1fanjtp - Flow_06jkril - Flow_125j8kx - - - - - - Flow_125j8kx - Flow_0gpy5vh - - - Flow_0gpy5vh - Flow_06jkril - Flow_1modke8 - - - Flow_1modke8 - - - - ${!pass} - - - - - ${pass} - - - - - - - ${designEngineerListSize > 0} - - - ${designEngineerListSize == 0} - - - - Flow_1o0npc9 - Flow_1ga3rk9 - Flow_10o9sl2 - - - Flow_10o9sl2 - Flow_11i64js - Flow_132fp4x - - - Flow_132fp4x + + Flow_1qgrfu1 - - Flow_01dzmhe - Flow_0ql7uu4 - Flow_15xpnyd + + Flow_0cx9yoz + Flow_1d18hwv + Flow_1g6f2ww - - Flow_15xpnyd + + Flow_1g6f2ww - + - Flow_11i64js - Flow_1ga3rk9 - + Flow_0xb4gtd + Flow_0cx9yoz + + + Flow_1d18hwv + Flow_1qgrfu1 + ${nrOfInstances == nrOfCompletedInstances} - - - - - ${moduleOwnerListSize > 0} + + Flow_1fanjtp + + + + + + Flow_1fanjtp + Flow_06jkril + Flow_125j8kx + + + + + + Flow_125j8kx + Flow_0gpy5vh + + + Flow_0gpy5vh + Flow_06jkril + Flow_1modke8 + + + Flow_1modke8 + + + + ${!pass} + + + + + ${pass} + + + + + + + ${designEngineerListSize > 0} - - - - - ${!pass} - - - ${pass} - - - ${moduleOwnerListSize == 0} + + ${designEngineerListSize == 0} - - Flow_0w3nr57 - Flow_14lgswg + + Flow_1o0npc9 + Flow_1ga3rk9 + Flow_10o9sl2 - - Flow_14lgswg + + Flow_10o9sl2 + Flow_11i64js + Flow_132fp4x + + + Flow_132fp4x - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Flow_01dzmhe + Flow_0ql7uu4 + Flow_15xpnyd + + + Flow_15xpnyd + + + + + + Flow_11i64js + Flow_1ga3rk9 + + ${nrOfInstances == nrOfCompletedInstances} + + + + + + ${moduleOwnerListSize > 0} + + + + + + ${!pass} + + + ${pass} + + + ${moduleOwnerListSize == 0} + + + + Flow_0w3nr57 + Flow_14lgswg + + + Flow_14lgswg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/laws-modules/src/main/resources/bpmn/项目合规评估流程camunda.bpmn b/laws-modules/src/main/resources/bpmn/项目合规评估流程camunda.bpmn index 6b7ab481..6c6d2fae 100644 --- a/laws-modules/src/main/resources/bpmn/项目合规评估流程camunda.bpmn +++ b/laws-modules/src/main/resources/bpmn/项目合规评估流程camunda.bpmn @@ -121,7 +121,7 @@ Flow_15xpnyd - + @@ -169,13 +169,6 @@ - - - - - - - @@ -186,25 +179,6 @@ - - - - - - - - - - - - - - - - - - - @@ -298,6 +272,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -347,6 +341,13 @@ + + + + + + +