1.枚举类增加发文管理->成果评价
2.公文管理控制器增加对外管理(没写完) 3.公共监控器分管领导节点://公文管理(发文管理)->成果评价->分管领导由所长改为副所长，且删除所长节点 4.公文管理->发文管理->成果评价流程图修改以上 5.对外事务流程图未写完
This commit is contained in:
parent
136a6fd7dd
commit
c1273d45ba
@ -56,7 +56,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 公文管理 前端控制器
|
||||
* 前端控制器
|
||||
* </p>
|
||||
*
|
||||
* @author jason@xqopen.cn
|
||||
@ -166,7 +166,10 @@ public class AdminDocumentManagementController implements AdminDocumentManagemen
|
||||
activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentCgPj, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentCgPj);
|
||||
}else if(ext.get("contentClass").equals("djKy")){
|
||||
activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentDjKy, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentDjKy);
|
||||
}else{
|
||||
}else if(ext.get("contentClass").equals("foreignAffairs")){//对外事务，新增流程图
|
||||
activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentDysw, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentDysw);
|
||||
}
|
||||
else{
|
||||
/*鄂技协\鄂技协纪要发文*/
|
||||
if(ext.get("CategoryID").equals("978108623924236290") || ext.get("CategoryID").equals("978108532228362241")){
|
||||
activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentXh, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentXh);
|
||||
|
||||
@ -418,6 +418,10 @@ public class MyTaskListener implements TaskListener {
|
||||
private String setBranchLeader(activitiEnum.activitiClass aClass, String name, Long id) {
|
||||
AdminDocumentManagement management = documentManagementService.selectById(id);
|
||||
switch (aClass) {
|
||||
case postDocumentCgPj: //公文管理(发文管理)->成果评价->分管领导由所长改为副所长，且删除所长节点
|
||||
return "depDirector";
|
||||
case postDocumentDysw: //公文管理(发文管理)->对外事务->删除部门主任节点，且分管领导为副所长
|
||||
return "depDirector";
|
||||
case receivedDocument:
|
||||
return "depDirector";
|
||||
/*case postDocument:
|
||||
|
||||
@ -151,7 +151,8 @@ public class activitiEnum {
|
||||
|
||||
@ApiModelProperty("发文")
|
||||
postDocumentHywbf("发文"),
|
||||
|
||||
@ApiModelProperty("发文")
|
||||
postDocumentDysw("发文管理->对外事务"),
|
||||
@ApiModelProperty("发文")
|
||||
postDocumentGong("发文"),
|
||||
|
||||
@ -474,6 +475,8 @@ public class activitiEnum {
|
||||
postDocumentCgPj("发文"),
|
||||
@ApiModelProperty("发文")
|
||||
postDocumentDjKy("发文"),
|
||||
@ApiModelProperty("发文")
|
||||
postDocumentDysw("发文->对外事务"),
|
||||
@ApiModelProperty("发文会签")
|
||||
signedDocument("发文会签"),
|
||||
@ApiModelProperty("收文任务")
|
||||
|
||||
@ -1,104 +1,86 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/testm1525406093092" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1525406093092" name="" targetNamespace="http://www.activiti.org/testm1525406093092" typeLanguage="http://www.w3.org/2001/XMLSchema">
|
||||
<process id="postDocumentCgPj" isClosed="false" isExecutable="true" name="发文管理" processType="None">
|
||||
<startEvent id="start" name="StartEvent"/>
|
||||
<userTask activiti:assignee="${apply}" activiti:exclusive="true" id="apply" name="申请人"/>
|
||||
<userTask activiti:assignee="${business}" activiti:exclusive="true" id="business" name="部门主任">
|
||||
<multiInstanceLoopCharacteristics activiti:collection="businessList" activiti:elementVariable="business" isSequential="false"/>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:tns="http://www.activiti.org/testm1525406093092" xmlns:xsd="http://www.w3.org/2001/XMLSchema" id="m1525406093092" name="" targetNamespace="http://www.activiti.org/testm1525406093092" exporter="Camunda Modeler" exporterVersion="5.25.0">
|
||||
<process id="postDocumentCgPj" name="发文管理" processType="None" isClosed="false" isExecutable="true">
|
||||
<startEvent id="start" name="StartEvent" />
|
||||
<userTask id="apply" name="申请人" activiti:assignee="${apply}" activiti:exclusive="true" />
|
||||
<userTask id="business" name="部门主任" activiti:assignee="${business}" activiti:exclusive="true">
|
||||
<multiInstanceLoopCharacteristics activiti:collection="businessList" activiti:elementVariable="business" />
|
||||
</userTask>
|
||||
<sequenceFlow id="_6" sourceRef="start" targetRef="apply"/>
|
||||
<sequenceFlow id="_7" sourceRef="apply" targetRef="business"/>
|
||||
<sequenceFlow id="_6" sourceRef="start" targetRef="apply" />
|
||||
<sequenceFlow id="_7" sourceRef="apply" targetRef="business" />
|
||||
<userTask id="branchLeader" name="分管领导" activiti:exclusive="true">
|
||||
<extensionElements>
|
||||
<activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create" />
|
||||
</extensionElements>
|
||||
<outgoing>_2</outgoing>
|
||||
</userTask>
|
||||
<sequenceFlow id="_3" sourceRef="business" targetRef="branchLeader" />
|
||||
<endEvent id="end" name="EndEvent">
|
||||
<extensionElements>
|
||||
<activiti:executionListener class="com.xqopen.kehui.flows.util.MyExecutionListener" event="end"/>
|
||||
<activiti:executionListener class="com.xqopen.kehui.flows.util.MyExecutionListener" event="end" />
|
||||
</extensionElements>
|
||||
<incoming>_2</incoming>
|
||||
</endEvent>
|
||||
<userTask activiti:exclusive="true" id="branchLeader" name="分管领导">
|
||||
<extensionElements>
|
||||
<activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create"/>
|
||||
</extensionElements>
|
||||
</userTask>
|
||||
<userTask activiti:exclusive="true" id="director" name="所长">
|
||||
<extensionElements>
|
||||
<activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create"/>
|
||||
</extensionElements>
|
||||
</userTask>
|
||||
<sequenceFlow id="_8" sourceRef="director" targetRef="end"/>
|
||||
<sequenceFlow id="_2" sourceRef="branchLeader" targetRef="director"/>
|
||||
<sequenceFlow id="_3" sourceRef="business" targetRef="branchLeader"/>
|
||||
<sequenceFlow id="_2" sourceRef="branchLeader" targetRef="end" />
|
||||
</process>
|
||||
<bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
|
||||
<bpmndi:BPMNDiagram id="Diagram-_1" name="New Diagram" documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0">
|
||||
<bpmndi:BPMNPlane bpmnElement="postDocumentCgPj">
|
||||
<bpmndi:BPMNShape bpmnElement="start" id="Shape-start">
|
||||
<dc:Bounds height="32.0" width="32.0" x="205.0" y="20.0"/>
|
||||
<bpmndi:BPMNShape id="Shape-start" bpmnElement="start">
|
||||
<dc:Bounds x="375" y="100" width="32" height="32" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
|
||||
<dc:Bounds x="160" y="80" width="52" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="apply" id="Shape-apply">
|
||||
<dc:Bounds height="55.0" width="85.0" x="185.0" y="155.0"/>
|
||||
<bpmndi:BPMNShape id="Shape-apply" bpmnElement="apply">
|
||||
<dc:Bounds x="355" y="235" width="85" height="55" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
|
||||
<dc:Bounds x="170" y="80" width="85" height="55" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="business" id="Shape-business">
|
||||
<dc:Bounds height="55.0" width="85.0" x="185.0" y="295.0"/>
|
||||
<bpmndi:BPMNShape id="Shape-business" bpmnElement="business">
|
||||
<dc:Bounds x="355" y="375" width="85" height="55" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
|
||||
<dc:Bounds x="170" y="80" width="85" height="55" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="end" id="Shape-end">
|
||||
<dc:Bounds height="32.0" width="32.0" x="215.0" y="745.0"/>
|
||||
<bpmndi:BPMNShape id="Shape-end" bpmnElement="end">
|
||||
<dc:Bounds x="385" y="825" width="32" height="32" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
|
||||
<dc:Bounds x="162" y="80" width="48" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="branchLeader" id="Shape-branchLeader">
|
||||
<dc:Bounds height="55.0" width="85.0" x="190.0" y="465.0"/>
|
||||
<bpmndi:BPMNShape id="Shape-branchLeader" bpmnElement="branchLeader">
|
||||
<dc:Bounds x="360" y="545" width="85" height="55" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
|
||||
<dc:Bounds x="170" y="80" width="85" height="55" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="director" id="Shape-director">
|
||||
<dc:Bounds height="55.0" width="85.0" x="190.0" y="595.0"/>
|
||||
<bpmndi:BPMNEdge id="BPMNEdge__6" bpmnElement="_6" sourceElement="Shape-start" targetElement="Shape-apply">
|
||||
<di:waypoint x="391" y="132" />
|
||||
<di:waypoint x="391" y="235" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge bpmnElement="_2" id="BPMNEdge__2" sourceElement="branchLeader" targetElement="director">
|
||||
<di:waypoint x="232.5" y="520.0"/>
|
||||
<di:waypoint x="232.5" y="595.0"/>
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
|
||||
<dc:Bounds x="0" y="0" width="0" height="0" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="_3" id="BPMNEdge__3" sourceElement="business" targetElement="branchLeader">
|
||||
<di:waypoint x="230.0" y="350.0"/>
|
||||
<di:waypoint x="230.0" y="465.0"/>
|
||||
<bpmndi:BPMNEdge id="BPMNEdge__7" bpmnElement="_7" sourceElement="Shape-apply" targetElement="Shape-business">
|
||||
<di:waypoint x="397.5" y="290" />
|
||||
<di:waypoint x="397.5" y="375" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
|
||||
<dc:Bounds x="0" y="0" width="0" height="0" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="_6" id="BPMNEdge__6" sourceElement="start" targetElement="apply">
|
||||
<di:waypoint x="221.0" y="52.0"/>
|
||||
<di:waypoint x="221.0" y="155.0"/>
|
||||
<bpmndi:BPMNEdge id="BPMNEdge__2" bpmnElement="_2">
|
||||
<di:waypoint x="402" y="600" />
|
||||
<di:waypoint x="400" y="825" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
|
||||
<dc:Bounds x="0" y="0" width="0" height="0" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="_7" id="BPMNEdge__7" sourceElement="apply" targetElement="business">
|
||||
<di:waypoint x="227.5" y="210.0"/>
|
||||
<di:waypoint x="227.5" y="295.0"/>
|
||||
<bpmndi:BPMNEdge id="BPMNEdge__3" bpmnElement="_3" sourceElement="Shape-business" targetElement="Shape-branchLeader">
|
||||
<di:waypoint x="400" y="430" />
|
||||
<di:waypoint x="400" y="545" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="director" targetElement="end">
|
||||
<di:waypoint x="230.0" y="650.0"/>
|
||||
<di:waypoint x="230.0" y="735.0"/>
|
||||
<di:waypoint x="230.0" y="745.0312805773287"/>
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
|
||||
<dc:Bounds x="0" y="0" width="0" height="0" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
</bpmndi:BPMNPlane>
|
||||
|
||||
87
src/main/resources/processes/postDocumentDysw.bpmn
Normal file
87
src/main/resources/processes/postDocumentDysw.bpmn
Normal file
@ -0,0 +1,87 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" id="m1557906421713" name="" targetNamespace="http://www.activiti.org/test" exporter="Camunda Modeler" exporterVersion="5.25.0">
|
||||
<process id="postDocumentDysw" name="发文管理(对外事务)" processType="None" isClosed="false" isExecutable="true">
|
||||
<startEvent id="start" name="StartEvent" />
|
||||
<userTask id="apply" name="申请人" activiti:assignee="${apply}" activiti:exclusive="true" />
|
||||
<userTask id="business" name="部门主任" activiti:assignee="${business}" activiti:exclusive="true">
|
||||
<multiInstanceLoopCharacteristics activiti:collection="businessList" activiti:elementVariable="business" />
|
||||
</userTask>
|
||||
<userTask id="branchLeader" name="分管领导" activiti:exclusive="true">
|
||||
<extensionElements>
|
||||
<activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create" />
|
||||
</extensionElements>
|
||||
<incoming>_12</incoming>
|
||||
</userTask>
|
||||
<endEvent id="end" name="EndEvent">
|
||||
<extensionElements>
|
||||
<activiti:executionListener class="com.xqopen.kehui.flows.util.MyExecutionListener" event="end" />
|
||||
</extensionElements>
|
||||
</endEvent>
|
||||
<sequenceFlow id="_7" sourceRef="start" targetRef="apply" />
|
||||
<sequenceFlow id="_8" sourceRef="apply" targetRef="business" />
|
||||
<sequenceFlow id="_10" sourceRef="branchLeader" targetRef="end" />
|
||||
<sequenceFlow id="_12" sourceRef="business" targetRef="branchLeader" />
|
||||
</process>
|
||||
<bpmndi:BPMNDiagram id="Diagram-_1" name="New Diagram" documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0">
|
||||
<bpmndi:BPMNPlane bpmnElement="postDocumentHywbf">
|
||||
<bpmndi:BPMNShape id="Shape-start" bpmnElement="start">
|
||||
<omgdc:Bounds x="595" y="80" width="32" height="32" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<omgdc:Bounds x="160" y="80" width="52" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Shape-apply" bpmnElement="apply">
|
||||
<omgdc:Bounds x="570" y="150" width="85" height="55" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<omgdc:Bounds x="170" y="80" width="85" height="55" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Shape-business" bpmnElement="business">
|
||||
<omgdc:Bounds x="570" y="240" width="85" height="55" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<omgdc:Bounds x="170" y="80" width="85" height="55" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Shape-branchLeader" bpmnElement="branchLeader">
|
||||
<omgdc:Bounds x="570" y="505" width="85" height="55" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<omgdc:Bounds x="170" y="80" width="85" height="55" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Shape-end" bpmnElement="end">
|
||||
<omgdc:Bounds x="600" y="665" width="32" height="32" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<omgdc:Bounds x="162" y="80" width="48" height="14" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge id="BPMNEdge__7" bpmnElement="_7" sourceElement="Shape-start" targetElement="Shape-apply">
|
||||
<omgdi:waypoint x="611" y="112" />
|
||||
<omgdi:waypoint x="611" y="150" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<omgdc:Bounds x="0" y="0" width="0" height="0" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="BPMNEdge__8" bpmnElement="_8" sourceElement="Shape-apply" targetElement="Shape-business">
|
||||
<omgdi:waypoint x="612.5" y="205" />
|
||||
<omgdi:waypoint x="612.5" y="240" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<omgdc:Bounds x="0" y="0" width="0" height="0" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="BPMNEdge__10" bpmnElement="_10" targetElement="Shape-end">
|
||||
<omgdi:waypoint x="616" y="560" />
|
||||
<omgdi:waypoint x="616" y="665" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<omgdc:Bounds x="0" y="0" width="0" height="0" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="BPMNEdge__12" bpmnElement="_12" sourceElement="Shape-business" targetElement="Shape-branchLeader">
|
||||
<omgdi:waypoint x="613" y="295" />
|
||||
<omgdi:waypoint x="613" y="505" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<omgdc:Bounds x="0" y="0" width="0" height="0" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
</bpmndi:BPMNPlane>
|
||||
</bpmndi:BPMNDiagram>
|
||||
</definitions>
|
||||
Loading…
x
Reference in New Issue
Block a user