update 标准征求意见流程
This commit is contained in:
+1
-1
@@ -535,7 +535,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
|
||||
// 文档拆分
|
||||
String url = "xiaobodata/openApi/article/search";
|
||||
map.put("pageNo", "1");
|
||||
map.put("pageSize", "1000");
|
||||
map.put("pageSize", "2");
|
||||
Map<String, Object> totalMap = asmsPostUtil.sendGetReq2(url, map);
|
||||
Integer total = (Integer) totalMap.get("total");
|
||||
map.put("pageSize", total.toString());
|
||||
|
||||
+1
-1
@@ -293,7 +293,7 @@ public class SynchronizationAsmsService {
|
||||
String url = "xiaobodata/openApi/article/search";
|
||||
Map<String, String> paramMap = new HashMap<>();
|
||||
paramMap.put("pageNo", "1");
|
||||
paramMap.put("pageSize", "1000");
|
||||
paramMap.put("pageSize", "2");
|
||||
Map<String, Object> totalMap = asmsPostUtil.sendGetReq2(url, paramMap);
|
||||
Integer total = (Integer) totalMap.get("total");
|
||||
paramMap.put("pageSize", total.toString());
|
||||
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
package com.jero.modules.activiti.process.fb.common;
|
||||
|
||||
/**
|
||||
* @Author: liao
|
||||
* @Date: 2023/11/13 10:55
|
||||
* @Description: 标准征求意见流程taskId
|
||||
*/
|
||||
public class ConsultationTaskId {
|
||||
|
||||
private ConsultationTaskId() {}
|
||||
|
||||
public static final String ENGINEER_START = "engineer_start"; // 法规工程师发起
|
||||
|
||||
public static final String ENGINEER_START_END = "engineer_start_end"; // 法规工程师汇总
|
||||
|
||||
public static final String DEPART_LEADER_START = "depart_leader_start"; // 各部所主管级领导分发
|
||||
|
||||
public static final String DEPART_LEADER_END_1 = "depart_leader_end_1"; // 各部所主管级领导汇总
|
||||
|
||||
public static final String DEPART_LEADER_END_2 = "depart_leader_end_2"; // 各部所主管级领导汇总
|
||||
|
||||
public static final String DEPART_LEADER_END_3 = "depart_leader_end_3"; // 各部所主管级领导汇总
|
||||
|
||||
public static final String DEPART_LEADER_END_4 = "depart_leader_end_4"; // 各部所主管级领导汇总
|
||||
|
||||
public static final String MODULE_OWNER_START = "module_owner_start"; // 模块负责人分发
|
||||
|
||||
public static final String MODULE_OWNER_END_1 = "module_owner_end_1"; // 模块负责人汇总
|
||||
|
||||
public static final String MODULE_OWNER_END_2 = "module_owner_end_2"; // 模块负责人汇总
|
||||
|
||||
public static final String MODULE_OWNER_END_3 = "module_owner_end_3"; // 模块负责人汇总
|
||||
|
||||
public static final String DESIGN_ENGINEER_1 = "design_engineer_1"; // 设计工程师填写征求意见
|
||||
|
||||
public static final String DESIGN_ENGINEER_2 = "design_engineer_2"; // 设计工程师填写征求意见
|
||||
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package com.jero.modules.activiti.process.fb.common;
|
||||
|
||||
/**
|
||||
* @Author: liao
|
||||
* @Date: 2023/11/13 10:06
|
||||
* @Description: 流程用户类型
|
||||
*/
|
||||
public class ProcessUserType {
|
||||
|
||||
private ProcessUserType() {}
|
||||
|
||||
public static final String ENGINEER = "engineer"; // 法规工程师
|
||||
|
||||
public static final String DEPART_LEADER = "departLeader"; // 部所主管级领导
|
||||
|
||||
public static final String MODULE_OWNER = "moduleOwner"; // 模块负责人
|
||||
|
||||
public static final String DESIGN_ENGINEER = "designEngineer"; // 设计工程师
|
||||
|
||||
public static final String OTHER = "other"; // 其他
|
||||
|
||||
}
|
||||
+4
@@ -34,4 +34,8 @@ public class ProcessFbStandardConsultationVO {
|
||||
@ApiModelProperty(value = "征求意见列表")
|
||||
private List<ProcessFbConsultationList> processFbConsultationLists;
|
||||
|
||||
/**用户类型*/
|
||||
@ApiModelProperty(value = "用户类型(engineer法规工程师、departLeader部所主管级领导、moduleOwner模块负责人、designEngineer设计工程师、other其他)")
|
||||
private String userType;
|
||||
|
||||
}
|
||||
|
||||
@@ -4,14 +4,13 @@
|
||||
<bpmn:startEvent id="StartEvent_1">
|
||||
<bpmn:outgoing>Flow_1d5objw</bpmn:outgoing>
|
||||
</bpmn:startEvent>
|
||||
<bpmn:userTask id="Activity_15884zz" name="发起,选择一个法规(可选拆分单数据)" activiti:assignee="${engineer}">
|
||||
<bpmn:userTask id="engineer_start" name="发起,选择一个法规(可选拆分单数据)" activiti:assignee="${engineer}">
|
||||
<bpmn:incoming>Flow_1d5objw</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0azsibi</bpmn:outgoing>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_1d5objw" sourceRef="StartEvent_1" targetRef="Activity_15884zz" />
|
||||
<bpmn:sequenceFlow id="Flow_1d5objw" sourceRef="StartEvent_1" targetRef="engineer_start" />
|
||||
<bpmn:subProcess id="Activity_0mj9ddw">
|
||||
<bpmn:incoming>Flow_0azsibi</bpmn:incoming>
|
||||
<bpmn:incoming>Flow_1aeqdsv</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_19vxot3</bpmn:outgoing>
|
||||
<bpmn:multiInstanceLoopCharacteristics activiti:collection="departLeaderList" activiti:elementVariable="departLeader">
|
||||
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
|
||||
@@ -19,35 +18,35 @@
|
||||
<bpmn:startEvent id="Event_1olxq4s">
|
||||
<bpmn:outgoing>Flow_1gv6jmb</bpmn:outgoing>
|
||||
</bpmn:startEvent>
|
||||
<bpmn:userTask id="Activity_0apj1oh" name="分发设计工程师,是否分发给模块负责人" activiti:assignee="${departLeader}">
|
||||
<bpmn:userTask id="depart_leader_start" name="分发设计工程师,是否分发给模块负责人" activiti:assignee="${departLeader}">
|
||||
<bpmn:incoming>Flow_1gv6jmb</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0hpm8eq</bpmn:outgoing>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_1gv6jmb" sourceRef="Event_1olxq4s" targetRef="Activity_0apj1oh" />
|
||||
<bpmn:sequenceFlow id="Flow_1gv6jmb" sourceRef="Event_1olxq4s" targetRef="depart_leader_start" />
|
||||
<bpmn:exclusiveGateway id="Gateway_0mogtm0">
|
||||
<bpmn:incoming>Flow_0hpm8eq</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_05oz1ja</bpmn:outgoing>
|
||||
<bpmn:outgoing>Flow_1ezcutn</bpmn:outgoing>
|
||||
</bpmn:exclusiveGateway>
|
||||
<bpmn:sequenceFlow id="Flow_0hpm8eq" sourceRef="Activity_0apj1oh" targetRef="Gateway_0mogtm0" />
|
||||
<bpmn:userTask id="Activity_10kxnw6" name="填写征求意见,到期不填视为无意见">
|
||||
<bpmn:sequenceFlow id="Flow_0hpm8eq" sourceRef="depart_leader_start" targetRef="Gateway_0mogtm0" />
|
||||
<bpmn:userTask id="design_engineer_2" name="填写征求意见,到期不填视为无意见">
|
||||
<bpmn:incoming>Flow_05oz1ja</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_09jjte7</bpmn:outgoing>
|
||||
<bpmn:multiInstanceLoopCharacteristics activiti:collection="designEngineerList" activiti:elementVariable="designEngineer">
|
||||
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
|
||||
</bpmn:multiInstanceLoopCharacteristics>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_05oz1ja" name="否" sourceRef="Gateway_0mogtm0" targetRef="Activity_10kxnw6">
|
||||
<bpmn:sequenceFlow id="Flow_05oz1ja" name="否" sourceRef="Gateway_0mogtm0" targetRef="design_engineer_2">
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!passFirst}</bpmn:conditionExpression>
|
||||
</bpmn:sequenceFlow>
|
||||
<bpmn:userTask id="Activity_0gcol5c" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${departLeader}">
|
||||
<bpmn:userTask id="depart_leader_end_1" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${departLeader}">
|
||||
<bpmn:incoming>Flow_0oc8671</bpmn:incoming>
|
||||
<bpmn:incoming>Flow_14aeapm</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_18olfei</bpmn:outgoing>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_09jjte7" sourceRef="Activity_10kxnw6" targetRef="Activity_0be5cyd" />
|
||||
<bpmn:sequenceFlow id="Flow_09jjte7" sourceRef="design_engineer_2" targetRef="depart_leader_end_2" />
|
||||
<bpmn:subProcess id="Activity_1pip97n">
|
||||
<bpmn:incoming>Flow_1ezcutn</bpmn:incoming>
|
||||
<bpmn:incoming>Flow_0f48izh</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0oc8671</bpmn:outgoing>
|
||||
<bpmn:multiInstanceLoopCharacteristics activiti:collection="moduleOwnerList" activiti:elementVariable="moduleOwner">
|
||||
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
|
||||
@@ -55,39 +54,39 @@
|
||||
<bpmn:startEvent id="Event_15afvr9">
|
||||
<bpmn:outgoing>Flow_13krhma</bpmn:outgoing>
|
||||
</bpmn:startEvent>
|
||||
<bpmn:userTask id="Activity_0iu180q" name="模块负责人" activiti:assignee="${moduleOwner}">
|
||||
<bpmn:userTask id="module_owner_start" name="模块负责人" activiti:assignee="${moduleOwner}">
|
||||
<bpmn:incoming>Flow_13krhma</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0e4x3wm</bpmn:outgoing>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_13krhma" sourceRef="Event_15afvr9" targetRef="Activity_0iu180q" />
|
||||
<bpmn:userTask id="Activity_1s6pnvt" name="填写征求意见,到期不填视为无意见">
|
||||
<bpmn:sequenceFlow id="Flow_13krhma" sourceRef="Event_15afvr9" targetRef="module_owner_start" />
|
||||
<bpmn:userTask id="design_engineer_1" name="填写征求意见,到期不填视为无意见">
|
||||
<bpmn:incoming>Flow_0e4x3wm</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0vnqotz</bpmn:outgoing>
|
||||
<bpmn:multiInstanceLoopCharacteristics activiti:collection="designEngineerList" activiti:elementVariable="designEngineer">
|
||||
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
|
||||
</bpmn:multiInstanceLoopCharacteristics>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_0e4x3wm" sourceRef="Activity_0iu180q" targetRef="Activity_1s6pnvt" />
|
||||
<bpmn:userTask id="Activity_1ll5cul" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${moduleOwner}">
|
||||
<bpmn:sequenceFlow id="Flow_0e4x3wm" sourceRef="module_owner_start" targetRef="design_engineer_1" />
|
||||
<bpmn:userTask id="module_owner_end_1" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${moduleOwner}">
|
||||
<bpmn:incoming>Flow_0vnqotz</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_05e6l5d</bpmn:outgoing>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_0vnqotz" sourceRef="Activity_1s6pnvt" targetRef="Activity_1ll5cul" />
|
||||
<bpmn:sequenceFlow id="Flow_0vnqotz" sourceRef="design_engineer_1" targetRef="module_owner_end_1" />
|
||||
<bpmn:endEvent id="Event_1vx05is">
|
||||
<bpmn:incoming>Flow_05e6l5d</bpmn:incoming>
|
||||
</bpmn:endEvent>
|
||||
<bpmn:sequenceFlow id="Flow_05e6l5d" sourceRef="Activity_1ll5cul" targetRef="Event_1vx05is" />
|
||||
<bpmn:sequenceFlow id="Flow_05e6l5d" sourceRef="module_owner_end_1" targetRef="Event_1vx05is" />
|
||||
</bpmn:subProcess>
|
||||
<bpmn:sequenceFlow id="Flow_1ezcutn" name="是" sourceRef="Gateway_0mogtm0" targetRef="Activity_1pip97n">
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passFirst}</bpmn:conditionExpression>
|
||||
</bpmn:sequenceFlow>
|
||||
<bpmn:sequenceFlow id="Flow_0oc8671" sourceRef="Activity_1pip97n" targetRef="Activity_0gcol5c" />
|
||||
<bpmn:sequenceFlow id="Flow_0oc8671" sourceRef="Activity_1pip97n" targetRef="depart_leader_end_1" />
|
||||
<bpmn:exclusiveGateway id="Gateway_1xd2kp3">
|
||||
<bpmn:incoming>Flow_18olfei</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_1t037bu</bpmn:outgoing>
|
||||
<bpmn:outgoing>Flow_0f48izh</bpmn:outgoing>
|
||||
</bpmn:exclusiveGateway>
|
||||
<bpmn:sequenceFlow id="Flow_18olfei" sourceRef="Activity_0gcol5c" targetRef="Gateway_1xd2kp3" />
|
||||
<bpmn:sequenceFlow id="Flow_18olfei" sourceRef="depart_leader_end_1" targetRef="Gateway_1xd2kp3" />
|
||||
<bpmn:endEvent id="Event_0r7jsfk">
|
||||
<bpmn:incoming>Flow_1t037bu</bpmn:incoming>
|
||||
<bpmn:incoming>Flow_0qai32h</bpmn:incoming>
|
||||
@@ -95,88 +94,147 @@
|
||||
<bpmn:sequenceFlow id="Flow_1t037bu" name="通过" sourceRef="Gateway_1xd2kp3" targetRef="Event_0r7jsfk">
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passSecond}</bpmn:conditionExpression>
|
||||
</bpmn:sequenceFlow>
|
||||
<bpmn:sequenceFlow id="Flow_0f48izh" name="驳回" sourceRef="Gateway_1xd2kp3" targetRef="Activity_1pip97n">
|
||||
<bpmn:sequenceFlow id="Flow_0f48izh" name="驳回" sourceRef="Gateway_1xd2kp3" targetRef="module_owner_end_2">
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!passSecond}</bpmn:conditionExpression>
|
||||
</bpmn:sequenceFlow>
|
||||
<bpmn:userTask id="Activity_0be5cyd" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${departLeader}">
|
||||
<bpmn:userTask id="depart_leader_end_2" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${departLeader}">
|
||||
<bpmn:incoming>Flow_09jjte7</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0qai32h</bpmn:outgoing>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_0qai32h" sourceRef="Activity_0be5cyd" targetRef="Event_0r7jsfk" />
|
||||
<bpmn:sequenceFlow id="Flow_0qai32h" sourceRef="depart_leader_end_2" targetRef="Event_0r7jsfk" />
|
||||
<bpmn:userTask id="module_owner_end_2" name="汇总全部分发人审批意见-修改/通过">
|
||||
<bpmn:incoming>Flow_0f48izh</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_14aeapm</bpmn:outgoing>
|
||||
<bpmn:multiInstanceLoopCharacteristics activiti:collection="moduleOwnerList" activiti:elementVariable="moduleOwner">
|
||||
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
|
||||
</bpmn:multiInstanceLoopCharacteristics>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_14aeapm" sourceRef="module_owner_end_2" targetRef="depart_leader_end_1" />
|
||||
</bpmn:subProcess>
|
||||
<bpmn:sequenceFlow id="Flow_0azsibi" sourceRef="Activity_15884zz" targetRef="Activity_0mj9ddw" />
|
||||
<bpmn:userTask id="Activity_1th4kyn" name="汇总结果 可修改 上传会议附件" activiti:assignee="${engineer}">
|
||||
<bpmn:sequenceFlow id="Flow_0azsibi" sourceRef="engineer_start" targetRef="Activity_0mj9ddw" />
|
||||
<bpmn:userTask id="engineer_start_end" name="汇总结果,可修改,上传会议附件" activiti:assignee="${engineer}">
|
||||
<bpmn:incoming>Flow_19vxot3</bpmn:incoming>
|
||||
<bpmn:incoming>Flow_0g6wwzz</bpmn:incoming>
|
||||
<bpmn:incoming>Flow_1f5fu60</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_1125yee</bpmn:outgoing>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_19vxot3" sourceRef="Activity_0mj9ddw" targetRef="Activity_1th4kyn" />
|
||||
<bpmn:sequenceFlow id="Flow_19vxot3" sourceRef="Activity_0mj9ddw" targetRef="engineer_start_end" />
|
||||
<bpmn:exclusiveGateway id="Gateway_0pd0196">
|
||||
<bpmn:incoming>Flow_1125yee</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0sb0q1z</bpmn:outgoing>
|
||||
<bpmn:outgoing>Flow_1aeqdsv</bpmn:outgoing>
|
||||
<bpmn:outgoing>Flow_0jjkrst</bpmn:outgoing>
|
||||
</bpmn:exclusiveGateway>
|
||||
<bpmn:sequenceFlow id="Flow_1125yee" sourceRef="Activity_1th4kyn" targetRef="Gateway_0pd0196" />
|
||||
<bpmn:sequenceFlow id="Flow_1125yee" sourceRef="engineer_start_end" targetRef="Gateway_0pd0196" />
|
||||
<bpmn:endEvent id="Event_07yr7ob">
|
||||
<bpmn:incoming>Flow_0sb0q1z</bpmn:incoming>
|
||||
</bpmn:endEvent>
|
||||
<bpmn:sequenceFlow id="Flow_0sb0q1z" name="通过" sourceRef="Gateway_0pd0196" targetRef="Event_07yr7ob">
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passThird}</bpmn:conditionExpression>
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passThird == 1}</bpmn:conditionExpression>
|
||||
</bpmn:sequenceFlow>
|
||||
<bpmn:sequenceFlow id="Flow_1aeqdsv" name="驳回" sourceRef="Gateway_0pd0196" targetRef="Activity_0mj9ddw">
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!passThird}</bpmn:conditionExpression>
|
||||
<bpmn:sequenceFlow id="Flow_1aeqdsv" name="驳回" sourceRef="Gateway_0pd0196" targetRef="depart_leader_end_3">
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passThird == 2}</bpmn:conditionExpression>
|
||||
</bpmn:sequenceFlow>
|
||||
<bpmn:userTask id="depart_leader_end_3" name="汇总全部分发人审批意见-修改/通过">
|
||||
<bpmn:incoming>Flow_1aeqdsv</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0g6wwzz</bpmn:outgoing>
|
||||
<bpmn:multiInstanceLoopCharacteristics activiti:collection="departLeaderList" activiti:elementVariable="departLeader">
|
||||
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
|
||||
</bpmn:multiInstanceLoopCharacteristics>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_0g6wwzz" sourceRef="depart_leader_end_3" targetRef="engineer_start_end" />
|
||||
<bpmn:subProcess id="Activity_0qqp5sb">
|
||||
<bpmn:incoming>Flow_0jjkrst</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_1f5fu60</bpmn:outgoing>
|
||||
<bpmn:multiInstanceLoopCharacteristics activiti:collection="departLeaderList" activiti:elementVariable="departLeader">
|
||||
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
|
||||
</bpmn:multiInstanceLoopCharacteristics>
|
||||
<bpmn:startEvent id="Event_0eapre1">
|
||||
<bpmn:outgoing>Flow_1bfoa9n</bpmn:outgoing>
|
||||
</bpmn:startEvent>
|
||||
<bpmn:userTask id="module_owner_end_3" name="汇总全部分发人审批意见-修改/通过">
|
||||
<bpmn:incoming>Flow_1bfoa9n</bpmn:incoming>
|
||||
<bpmn:incoming>Flow_1ft2poj</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0mdmcs5</bpmn:outgoing>
|
||||
<bpmn:multiInstanceLoopCharacteristics activiti:collection="moduleOwnerList" activiti:elementVariable="moduleOwner">
|
||||
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
|
||||
</bpmn:multiInstanceLoopCharacteristics>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_1bfoa9n" sourceRef="Event_0eapre1" targetRef="module_owner_end_3" />
|
||||
<bpmn:userTask id="depart_leader_end_4" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${departLeader}">
|
||||
<bpmn:incoming>Flow_0mdmcs5</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0flbibd</bpmn:outgoing>
|
||||
</bpmn:userTask>
|
||||
<bpmn:sequenceFlow id="Flow_0mdmcs5" sourceRef="module_owner_end_3" targetRef="depart_leader_end_4" />
|
||||
<bpmn:exclusiveGateway id="Gateway_1pq4fen">
|
||||
<bpmn:incoming>Flow_0flbibd</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_1ta4894</bpmn:outgoing>
|
||||
<bpmn:outgoing>Flow_1ft2poj</bpmn:outgoing>
|
||||
</bpmn:exclusiveGateway>
|
||||
<bpmn:sequenceFlow id="Flow_0flbibd" sourceRef="depart_leader_end_4" targetRef="Gateway_1pq4fen" />
|
||||
<bpmn:endEvent id="Event_07vxc54">
|
||||
<bpmn:incoming>Flow_1ta4894</bpmn:incoming>
|
||||
</bpmn:endEvent>
|
||||
<bpmn:sequenceFlow id="Flow_1ta4894" name="通过" sourceRef="Gateway_1pq4fen" targetRef="Event_07vxc54">
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passSecond}</bpmn:conditionExpression>
|
||||
</bpmn:sequenceFlow>
|
||||
<bpmn:sequenceFlow id="Flow_1ft2poj" name="驳回" sourceRef="Gateway_1pq4fen" targetRef="module_owner_end_3">
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!passSecond}</bpmn:conditionExpression>
|
||||
</bpmn:sequenceFlow>
|
||||
</bpmn:subProcess>
|
||||
<bpmn:sequenceFlow id="Flow_0jjkrst" name="驳回" sourceRef="Gateway_0pd0196" targetRef="Activity_0qqp5sb">
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passThird == 3}</bpmn:conditionExpression>
|
||||
</bpmn:sequenceFlow>
|
||||
<bpmn:sequenceFlow id="Flow_1f5fu60" sourceRef="Activity_0qqp5sb" targetRef="engineer_start_end" />
|
||||
</bpmn:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="fb-standard-consultation">
|
||||
<bpmndi:BPMNShape id="Activity_15884zz_di" bpmnElement="Activity_15884zz">
|
||||
<dc:Bounds x="160" y="360" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds x="192" y="282" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_1th4kyn_di" bpmnElement="Activity_1th4kyn">
|
||||
<dc:Bounds x="1560" y="360" width="100" height="80" />
|
||||
<bpmndi:BPMNShape id="Activity_15884zz_di" bpmnElement="engineer_start">
|
||||
<dc:Bounds x="160" y="360" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Gateway_0pd0196_di" bpmnElement="Gateway_0pd0196" isMarkerVisible="true">
|
||||
<dc:Bounds x="1585" y="495" width="50" height="50" />
|
||||
<bpmndi:BPMNShape id="BPMNShape_0k4hx5w" bpmnElement="depart_leader_end_3">
|
||||
<dc:Bounds x="1780" y="430" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Event_07yr7ob_di" bpmnElement="Event_07yr7ob">
|
||||
<dc:Bounds x="1592" y="622" width="36" height="36" />
|
||||
<dc:Bounds x="1492" y="502" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0mj9ddw_di" bpmnElement="Activity_0mj9ddw" isExpanded="true">
|
||||
<dc:Bounds x="320" y="40" width="1120" height="690" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Event_1olxq4s_di" bpmnElement="Event_1olxq4s">
|
||||
<dc:Bounds x="342" y="382" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0apj1oh_di" bpmnElement="depart_leader_start">
|
||||
<dc:Bounds x="430" y="360" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Gateway_0mogtm0_di" bpmnElement="Gateway_0mogtm0" isMarkerVisible="true">
|
||||
<dc:Bounds x="585" y="375" width="50" height="50" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="775" y="130" width="78" height="40" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0apj1oh_di" bpmnElement="Activity_0apj1oh">
|
||||
<dc:Bounds x="430" y="360" width="100" height="80" />
|
||||
<bpmndi:BPMNShape id="Activity_10kxnw6_di" bpmnElement="design_engineer_2">
|
||||
<dc:Bounds x="730" y="360" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Event_1olxq4s_di" bpmnElement="Event_1olxq4s">
|
||||
<dc:Bounds x="342" y="382" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Event_0r7jsfk_di" bpmnElement="Event_0r7jsfk">
|
||||
<dc:Bounds x="1232" y="522" width="36" height="36" />
|
||||
<dc:Bounds x="1252" y="552" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="BPMNShape_1qjvmbo" bpmnElement="Activity_0be5cyd">
|
||||
<dc:Bounds x="950" y="600" width="100" height="80" />
|
||||
<bpmndi:BPMNShape id="BPMNShape_18s4mik" bpmnElement="module_owner_end_2">
|
||||
<dc:Bounds x="1090" y="340" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Gateway_1xd2kp3_di" bpmnElement="Gateway_1xd2kp3" isMarkerVisible="true">
|
||||
<dc:Bounds x="1115" y="415" width="50" height="50" />
|
||||
<dc:Bounds x="1245" y="435" width="50" height="50" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0gcol5c_di" bpmnElement="Activity_0gcol5c">
|
||||
<dc:Bounds x="950" y="400" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_10kxnw6_di" bpmnElement="Activity_10kxnw6">
|
||||
<dc:Bounds x="720" y="490" width="100" height="80" />
|
||||
<bpmndi:BPMNShape id="Activity_0gcol5c_di" bpmnElement="depart_leader_end_1">
|
||||
<dc:Bounds x="890" y="420" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_1pip97n_di" bpmnElement="Activity_1pip97n" isExpanded="true">
|
||||
@@ -185,15 +243,15 @@
|
||||
<bpmndi:BPMNShape id="Event_15afvr9_di" bpmnElement="Event_15afvr9">
|
||||
<dc:Bounds x="712" y="192" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0iu180q_di" bpmnElement="Activity_0iu180q">
|
||||
<bpmndi:BPMNShape id="Activity_0iu180q_di" bpmnElement="module_owner_start">
|
||||
<dc:Bounds x="800" y="170" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_1s6pnvt_di" bpmnElement="Activity_1s6pnvt">
|
||||
<bpmndi:BPMNShape id="Activity_1s6pnvt_di" bpmnElement="design_engineer_1">
|
||||
<dc:Bounds x="960" y="170" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_1ll5cul_di" bpmnElement="Activity_1ll5cul">
|
||||
<bpmndi:BPMNShape id="Activity_1ll5cul_di" bpmnElement="module_owner_end_1">
|
||||
<dc:Bounds x="1120" y="170" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
@@ -216,28 +274,29 @@
|
||||
<di:waypoint x="1220" y="210" />
|
||||
<di:waypoint x="1282" y="210" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_05oz1ja_di" bpmnElement="Flow_05oz1ja">
|
||||
<di:waypoint x="610" y="425" />
|
||||
<di:waypoint x="610" y="530" />
|
||||
<di:waypoint x="720" y="530" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="620" y="475" width="11" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_09jjte7_di" bpmnElement="Flow_09jjte7">
|
||||
<di:waypoint x="820" y="530" />
|
||||
<di:waypoint x="885" y="530" />
|
||||
<di:waypoint x="885" y="640" />
|
||||
<di:waypoint x="950" y="640" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0oc8671_di" bpmnElement="Flow_0oc8671">
|
||||
<di:waypoint x="1000" y="310" />
|
||||
<di:waypoint x="1000" y="400" />
|
||||
<bpmndi:BPMNShape id="BPMNShape_1qjvmbo" bpmnElement="depart_leader_end_2">
|
||||
<dc:Bounds x="730" y="530" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge id="Flow_1gv6jmb_di" bpmnElement="Flow_1gv6jmb">
|
||||
<di:waypoint x="378" y="400" />
|
||||
<di:waypoint x="430" y="400" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0hpm8eq_di" bpmnElement="Flow_0hpm8eq">
|
||||
<di:waypoint x="530" y="400" />
|
||||
<di:waypoint x="585" y="400" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_05oz1ja_di" bpmnElement="Flow_05oz1ja">
|
||||
<di:waypoint x="635" y="400" />
|
||||
<di:waypoint x="730" y="400" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="681" y="377" width="12" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_09jjte7_di" bpmnElement="Flow_09jjte7">
|
||||
<di:waypoint x="780" y="440" />
|
||||
<di:waypoint x="780" y="530" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1ezcutn_di" bpmnElement="Flow_1ezcutn">
|
||||
<di:waypoint x="610" y="375" />
|
||||
<di:waypoint x="610" y="210" />
|
||||
@@ -246,33 +305,92 @@
|
||||
<dc:Bounds x="620" y="291" width="11" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1gv6jmb_di" bpmnElement="Flow_1gv6jmb">
|
||||
<di:waypoint x="378" y="400" />
|
||||
<di:waypoint x="430" y="400" />
|
||||
<bpmndi:BPMNEdge id="Flow_0oc8671_di" bpmnElement="Flow_0oc8671">
|
||||
<di:waypoint x="940" y="310" />
|
||||
<di:waypoint x="940" y="420" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_18olfei_di" bpmnElement="Flow_18olfei">
|
||||
<di:waypoint x="1050" y="440" />
|
||||
<di:waypoint x="1115" y="440" />
|
||||
<di:waypoint x="990" y="460" />
|
||||
<di:waypoint x="1245" y="460" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1t037bu_di" bpmnElement="Flow_1t037bu">
|
||||
<di:waypoint x="1140" y="465" />
|
||||
<di:waypoint x="1140" y="540" />
|
||||
<di:waypoint x="1232" y="540" />
|
||||
<di:waypoint x="1270" y="485" />
|
||||
<di:waypoint x="1270" y="552" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="1140" y="496" width="22" height="14" />
|
||||
<dc:Bounds x="1270" y="512" width="23" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0f48izh_di" bpmnElement="Flow_0f48izh">
|
||||
<di:waypoint x="1140" y="415" />
|
||||
<di:waypoint x="1140" y="310" />
|
||||
<di:waypoint x="1270" y="435" />
|
||||
<di:waypoint x="1270" y="380" />
|
||||
<di:waypoint x="1190" y="380" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="1146" y="357" width="21" height="14" />
|
||||
<dc:Bounds x="1276" y="401" width="22" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0qai32h_di" bpmnElement="Flow_0qai32h">
|
||||
<di:waypoint x="1050" y="640" />
|
||||
<di:waypoint x="1250" y="640" />
|
||||
<di:waypoint x="1250" y="558" />
|
||||
<di:waypoint x="830" y="570" />
|
||||
<di:waypoint x="1252" y="570" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_14aeapm_di" bpmnElement="Flow_14aeapm">
|
||||
<di:waypoint x="1090" y="381" />
|
||||
<di:waypoint x="960" y="385" />
|
||||
<di:waypoint x="960" y="420" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNShape id="Activity_1th4kyn_di" bpmnElement="engineer_start_end">
|
||||
<dc:Bounds x="1560" y="360" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Gateway_0pd0196_di" bpmnElement="Gateway_0pd0196" isMarkerVisible="true">
|
||||
<dc:Bounds x="1585" y="495" width="50" height="50" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0qqp5sb_di" bpmnElement="Activity_0qqp5sb" isExpanded="true">
|
||||
<dc:Bounds x="1492" y="600" width="528" height="240" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Event_0eapre1_di" bpmnElement="Event_0eapre1">
|
||||
<dc:Bounds x="1512" y="702" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="BPMNShape_00so089" bpmnElement="module_owner_end_3">
|
||||
<dc:Bounds x="1590" y="680" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Gateway_1pq4fen_di" bpmnElement="Gateway_1pq4fen" isMarkerVisible="true">
|
||||
<dc:Bounds x="1865" y="695" width="50" height="50" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Event_07vxc54_di" bpmnElement="Event_07vxc54">
|
||||
<dc:Bounds x="1952" y="702" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="BPMNShape_035drax" bpmnElement="depart_leader_end_4">
|
||||
<dc:Bounds x="1730" y="680" width="100" height="80" />
|
||||
<bpmndi:BPMNLabel />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge id="Flow_1bfoa9n_di" bpmnElement="Flow_1bfoa9n">
|
||||
<di:waypoint x="1548" y="720" />
|
||||
<di:waypoint x="1590" y="720" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0mdmcs5_di" bpmnElement="Flow_0mdmcs5">
|
||||
<di:waypoint x="1690" y="720" />
|
||||
<di:waypoint x="1730" y="720" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0flbibd_di" bpmnElement="Flow_0flbibd">
|
||||
<di:waypoint x="1830" y="720" />
|
||||
<di:waypoint x="1865" y="720" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1ta4894_di" bpmnElement="Flow_1ta4894">
|
||||
<di:waypoint x="1915" y="720" />
|
||||
<di:waypoint x="1952" y="720" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="1923" y="702" width="22" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1ft2poj_di" bpmnElement="Flow_1ft2poj">
|
||||
<di:waypoint x="1890" y="695" />
|
||||
<di:waypoint x="1890" y="630" />
|
||||
<di:waypoint x="1640" y="630" />
|
||||
<di:waypoint x="1640" y="680" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="1756" y="612" width="21" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1d5objw_di" bpmnElement="Flow_1d5objw">
|
||||
<di:waypoint x="210" y="318" />
|
||||
@@ -291,19 +409,39 @@
|
||||
<di:waypoint x="1610" y="495" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0sb0q1z_di" bpmnElement="Flow_0sb0q1z">
|
||||
<di:waypoint x="1610" y="545" />
|
||||
<di:waypoint x="1610" y="622" />
|
||||
<di:waypoint x="1585" y="520" />
|
||||
<di:waypoint x="1528" y="520" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="1615" y="581" width="22" height="14" />
|
||||
<dc:Bounds x="1542" y="496" width="22" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1aeqdsv_di" bpmnElement="Flow_1aeqdsv">
|
||||
<di:waypoint x="1585" y="520" />
|
||||
<di:waypoint x="1440" y="520" />
|
||||
<di:waypoint x="1635" y="520" />
|
||||
<di:waypoint x="1708" y="520" />
|
||||
<di:waypoint x="1708" y="470" />
|
||||
<di:waypoint x="1780" y="470" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="1503" y="502" width="21" height="14" />
|
||||
<dc:Bounds x="1733" y="452" width="21" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0g6wwzz_di" bpmnElement="Flow_0g6wwzz">
|
||||
<di:waypoint x="1830" y="430" />
|
||||
<di:waypoint x="1830" y="400" />
|
||||
<di:waypoint x="1660" y="400" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0jjkrst_di" bpmnElement="Flow_0jjkrst">
|
||||
<di:waypoint x="1610" y="545" />
|
||||
<di:waypoint x="1610" y="600" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="1616" y="569" width="21" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1f5fu60_di" bpmnElement="Flow_1f5fu60">
|
||||
<di:waypoint x="1960" y="600" />
|
||||
<di:waypoint x="1960" y="320" />
|
||||
<di:waypoint x="1610" y="320" />
|
||||
<di:waypoint x="1610" y="360" />
|
||||
</bpmndi:BPMNEdge>
|
||||
</bpmndi:BPMNPlane>
|
||||
</bpmndi:BPMNDiagram>
|
||||
</definitions>
|
||||
|
||||
Reference in New Issue
Block a user