Merge branch 'dev_oracle_neo' into 'dev_oracle'

Dev oracle neo

See merge request root/atms!143

atms-api/pom.xml

@@ -23,6 +23,7 @@
             <version>0.0.1</version>
         </dependency>
 
+
         <dependency>
             <groupId>pwc.taxtech.atms</groupId>
             <artifactId>atms-dao</artifactId>
@@ -339,6 +340,24 @@
             <artifactId>spring-data-commons</artifactId>
             <version>2.1.0.RELEASE</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-engine</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-spring</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-rest</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -390,6 +409,7 @@
                     <include>**/*.properties</include>
                     <include>**/*.xml</include>
                     <include>**/*.sql</include>
+                    <include>**/*.bpmn</include>
                 </includes>
                 <filtering>true</filtering><!-- replace variable attribute or not -->
             </resource>

atms-api/src/main/java/pwc/taxtech/atms/controller/ApprovalController.java

+package pwc.taxtech.atms.controller;
+
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.dto.approval.ApprovalDto;
+import pwc.taxtech.atms.dto.approval.ApprovalTask;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/api/v1/approval")
+public class ApprovalController {
+    private static Logger logger = LoggerFactory.getLogger(ApprovalController.class);
+    @Autowired
+    RuntimeService runtimeService;
+    @Autowired
+    TaskService taskService;
+    @Autowired
+    RepositoryService repositoryService;
+
+    @ResponseBody
+    @RequestMapping(value = "/deploy", method = RequestMethod.POST)
+    public ResponseEntity deploy() {
+        repositoryService.createDeployment().addClasspathResource("bpmn/approval.bpmn").deploy();
+        return ResponseEntity.ok().build();
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/commit", method = RequestMethod.POST)
+    public ApprovalDto approval(@RequestBody ApprovalDto dto) {
+        ProcessInstance pi = runtimeService.startProcessInstanceByKey("approvalProcess");
+        dto.setInstaceId(pi.getId());
+        mocoInsert(dto);//todo use service insert
+        return dto;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/tasks/{assignee}")
+    public List<ApprovalTask> data(@PathVariable String assignee) {
+        List<Task> tasks = taskService.createTaskQuery().taskAssignee(assignee).list();
+        List<ApprovalTask> list = new ArrayList<>();
+        for (Task task : tasks) {
+            ApprovalTask t = new ApprovalTask();
+            list.add(t.copyfrom(task));
+        }
+        return list;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/check/{taskId}")
+    public String check(@PathVariable String taskId, @RequestParam(required = false) Integer committed,
+                        @RequestParam(required = false) Integer decide) {
+        Map<String, Object> map = new HashMap<>();
+        if (committed != null && (committed == 0 || committed == 1)) {
+            map.put("committed", committed);
+            taskService.complete(taskId, map);
+            if (committed == 1) mocoHasCommittedAndOver();
+        } else if (decide != null && (decide == 0 || decide == 1)) {
+            map.put("decide", decide);
+            taskService.complete(taskId, map);
+            if (decide == 1) mocoAggreAndOver();
+            else mocoDisAggreAndOver();
+        }
+        return taskId;
+    }
+
+    private void mocoHasCommitted() {
+
+    }
+
+
+    @RequestMapping(value = "/show/{procDefId}")//获取流程图
+    public void showImg(@PathVariable String procDefId, HttpServletResponse response) {
+        try {
+            ProcessDefinition pd = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId).singleResult();
+            String diagramResourceName = pd.getDiagramResourceName();
+            InputStream pic = repositoryService.getResourceAsStream(pd.getDeploymentId(), diagramResourceName);
+
+            byte[] b = new byte[1024];
+            int len = -1;
+            while ((len = pic.read(b, 0, 1024)) != -1) {
+                response.getOutputStream().write(b, 0, len);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/showImg/{procDefId}/{executionId}")//获取流程坐标
+    public Rect showImg(@PathVariable String procDefId, @PathVariable String executionId) {
+        Rect rect = new Rect();
+        try {
+            repositoryService.getProcessDefinition(procDefId);
+//            ActivityImpl img = Workflow.getProcessMap(procDefId,executionId );
+//            rect.setX(img.getX());
+//            rect.setY(img.getY());
+//            rect.setWidth(img.getWidth());
+//            rect.setHeight(img.getHeight());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return rect;
+    }
+
+
+    static class Rect {
+        String X;
+        String Y;
+        String width;
+        String height;
+
+        public String getX() {
+            return X;
+        }
+
+        public void setX(String x) {
+            X = x;
+        }
+
+        public String getY() {
+            return Y;
+        }
+
+        public void setY(String y) {
+            Y = y;
+        }
+
+        public String getWidth() {
+            return width;
+        }
+
+        public void setWidth(String width) {
+            this.width = width;
+        }
+
+        public String getHeight() {
+            return height;
+        }
+
+        public void setHeight(String height) {
+            this.height = height;
+        }
+    }
+
+
+    private void mocoDisAggreAndOver() {
+        logger.debug("------------------------update db -----------------------------------");
+        logger.debug("dis aggre");
+        logger.debug("------------------------updage db-----------------------------------");
+    }
+
+    private void mocoAggreAndOver() {
+        logger.debug("------------------------update db-----------------------------------");
+        logger.debug("aggree");
+        logger.debug("------------------------update db-----------------------------------");
+    }
+
+    private void mocoHasCommittedAndOver() {
+        logger.debug("-------------------------update db----------------------------------");
+        logger.debug("has committed");
+        logger.debug("-------------------------update db----------------------------------");
+    }
+
+
+    private void mocoInsert(ApprovalDto dto) {
+        logger.debug("-------------------------insert db----------------------------------");
+        logger.debug("save approval {}", dto.toString());
+        logger.debug("-------------------------insert db----------------------------------");
+    }
+
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/approval/ApprovalDto.java

+package pwc.taxtech.atms.dto.approval;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ApprovalDto {
+    private String projectId;
+    private Long reportId;
+    private Integer period;
+    private String instaceId;
+    private String status;//committed,agreed,disagreed
+
+    @Override
+    public String toString() {
+        return "ApprovalDto{" +
+                "projectId='" + projectId + '\'' +
+                ", reportId=" + reportId +
+                ", period=" + period +
+                ", instaceId='" + instaceId + '\'' +
+                ", status='" + status + '\'' +
+                '}';
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/approval/ApprovalTask.java

+package pwc.taxtech.atms.dto.approval;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.activiti.engine.task.Task;
+import pwc.taxtech.atms.controller.ApprovalController;
+
+@Getter
+@Setter
+public class ApprovalTask {
+    private String taskId;
+    private String name;
+    private String assignee;
+    private String executionId;
+    private String processInstanceId;
+    private String processDefinitionId;
+
+    @Override
+    public String toString() {
+        return "ApprovalTask{" +
+                "taskId='" + taskId + '\'' +
+                ", name='" + name + '\'' +
+                ", assignee='" + assignee + '\'' +
+                ", executionId='" + executionId + '\'' +
+                ", processInstanceId='" + processInstanceId + '\'' +
+                ", processDefinitionId='" + processDefinitionId + '\'' +
+                '}';
+    }
+
+    public ApprovalTask copyfrom(Task task) {
+        setTaskId(task.getId());
+        setName(task.getName());
+        setAssignee(task.getAssignee());
+        setExecutionId(task.getExecutionId());
+        setProcessInstanceId(task.getProcessInstanceId());
+        setProcessDefinitionId(task.getProcessDefinitionId());
+        return this;
+    }
+}

atms-api/src/main/resources/applicationContext-security.xml

@@ -16,6 +16,7 @@
 		<!-- https://springcloud.cc/spring-security-zhcn.html -->
 		<intercept-url pattern="/api/v1/cache/getallcache" access="permitAll" />
 		<intercept-url pattern="/api/v1/user/login" access="permitAll" />
+		<intercept-url pattern="/api/v1/approval/**" access="permitAll" />
         <intercept-url pattern="/api/**" access="authenticated" />
 		<intercept-url pattern="/**" access="permitAll" />
 		<headers>

atms-api/src/main/resources/applicationContext.xml

@@ -99,4 +99,34 @@
     <property name="cacheManager" ref="cacheManagerFactory"/>
   </bean>
 
+  <!-- atms activit for workflow-->
+  <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
+    <property name="dataSource" ref="dataSource"/>
+    <property name="transactionManager" ref="transactionManager"/>
+    <property name="databaseSchemaUpdate" value="true"/>
+    <property name="jobExecutorActivate" value="true"/>
+    <!-- 以下2个是为了防止生成流程图片时出现乱码 -->
+    <property name="activityFontName" value="宋体"/>
+    <property name="labelFontName" value="宋体"/>
+  </bean>
+
+  <!-- 流程引擎 -->
+  <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
+    <property name="processEngineConfiguration" ref="processEngineConfiguration"/>
+  </bean>
+
+  <!-- 流程服务 -->
+  <bean id="repositoryService" factory-bean="processEngine"
+        factory-method="getRepositoryService"/>
+  <bean id="runtimeService" factory-bean="processEngine"
+        factory-method="getRuntimeService"/>
+  <bean id="taskService" factory-bean="processEngine"
+        factory-method="getTaskService"/>
+  <bean id="historyService" factory-bean="processEngine"
+        factory-method="getHistoryService"/>
+  <bean id="managementService" factory-bean="processEngine"
+        factory-method="getManagementService"/>
+  <bean id="IdentityService" factory-bean="processEngine"
+        factory-method="getIdentityService"/>
+
 </beans>
\ No newline at end of file

atms-api/src/main/resources/bpmn/approval.bpmn

+<?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/testm1539848247913" 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="m1539848247913" name="" targetNamespace="http://www.activiti.org/testm1539848247913" typeLanguage="http://www.w3.org/2001/XMLSchema">
+  <process id="approvalProcess" isClosed="false" isExecutable="true" name="ApprovalProcess" processType="None">
+    <startEvent id="_2" name="StartEvent"/>
+    <userTask activiti:assignee="accountant" activiti:exclusive="true" id="_3" name="税务会计"/>
+    <sequenceFlow id="_4" sourceRef="_2" targetRef="_3"/>
+    <userTask activiti:assignee="manager" activiti:exclusive="true" id="_5" name="税务经理"/>
+    <endEvent id="_7" name="EndEvent"/>
+    <endEvent id="_9" name="EndEvent"/>
+    <exclusiveGateway gatewayDirection="Unspecified" id="_12" name="ExclusiveGateway"/>
+    <sequenceFlow id="_13" name="审核" sourceRef="_5" targetRef="_12"/>
+    <sequenceFlow id="_8" name="通过" sourceRef="_12" targetRef="_7">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${decide==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_10" name="驳回" sourceRef="_12" targetRef="_9">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${decide==0}]]></conditionExpression>
+    </sequenceFlow>
+    <exclusiveGateway gatewayDirection="Unspecified" id="_11" name="ExclusiveGateway"/>
+    <sequenceFlow id="_14" name="提审" sourceRef="_3" targetRef="_11"/>
+    <sequenceFlow id="_15" name="未提交" sourceRef="_11" targetRef="_5">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${committed==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_16" name="已提交" sourceRef="_11" targetRef="_9">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${committed==1}]]></conditionExpression>
+    </sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram 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" id="Diagram-_1" name="New Diagram">
+    <bpmndi:BPMNPlane bpmnElement="approvalProcess">
+      <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
+        <dc:Bounds height="32.0" width="32.0" x="50.0" y="380.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_3" id="Shape-_3">
+        <dc:Bounds height="55.0" width="85.0" x="190.0" y="370.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5">
+        <dc:Bounds height="55.0" width="85.0" x="410.0" y="165.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_7" id="Shape-_7">
+        <dc:Bounds height="32.0" width="32.0" x="765.0" y="105.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_9" id="Shape-_9">
+        <dc:Bounds height="32.0" width="32.0" x="760.0" y="380.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_12" id="Shape-_12" isMarkerVisible="false">
+        <dc:Bounds height="32.0" width="32.0" x="640.0" y="175.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_11" id="Shape-_11" isMarkerVisible="false">
+        <dc:Bounds height="32.0" width="32.0" x="390.0" y="380.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="_13" id="BPMNEdge__13" sourceElement="_5" targetElement="_12">
+        <di:waypoint x="510.0" y="192.5"/>
+        <di:waypoint x="640.0" y="191.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_15" id="BPMNEdge__15" sourceElement="_11" targetElement="_5">
+        <di:waypoint x="416.0" y="375.0"/>
+        <di:waypoint x="416.0" y="220.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_14" id="BPMNEdge__14" sourceElement="_3" targetElement="_11">
+        <di:waypoint x="290.0" y="397.5"/>
+        <di:waypoint x="390.0" y="396.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_16" id="BPMNEdge__16" sourceElement="_11" targetElement="_9">
+        <di:waypoint x="437.0" y="396.0"/>
+        <di:waypoint x="760.0" y="396.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_4" id="BPMNEdge__4" sourceElement="_2" targetElement="_3">
+        <di:waypoint x="97.0" y="396.0"/>
+        <di:waypoint x="190.0" y="397.5"/>
+        <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="_12" targetElement="_7">
+        <di:waypoint x="687.0" y="191.0"/>
+        <di:waypoint x="765.0" y="121.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_10" id="BPMNEdge__10" sourceElement="_12" targetElement="_9">
+        <di:waypoint x="687.0" y="191.0"/>
+        <di:waypoint x="760.0" y="396.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

atms-api/src/main/resources/bpmn/leave.bpmn

+<?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/testm1539743341882" 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="m1539743341882" name="" targetNamespace="http://www.activiti.org/testm1539743341882" typeLanguage="http://www.w3.org/2001/XMLSchema">
+  <process id="leaveProcess" isClosed="false" isExecutable="true" name="LeaveProcess" processType="None">
+    <startEvent id="_2" name="StartEvent"/>
+    <userTask activiti:assignee="apply" activiti:exclusive="true" id="usertask1" name="璇峰亣鐢宠"/>
+    <exclusiveGateway gatewayDirection="Unspecified" id="_4" name="ExclusiveGateway"/>
+    <userTask activiti:assignee="apply" activiti:exclusive="true" id="userTask2" name="瀹℃壒锛堥?鐩粡鐞嗭?"/>
+    <userTask activiti:assignee="boss" activiti:exclusive="true" id="usertask3" name="瀹℃壒锛堣�佹澘锛�"/>
+    <endEvent id="_7" name="EndEvent"/>
+    <sequenceFlow id="_8" sourceRef="_2" targetRef="usertask1"/>
+    <sequenceFlow id="_9" name="澶╂暟鍒ゆ柇" sourceRef="usertask1" targetRef="_4">
+      <documentation id="_9_D_1"/>
+    </sequenceFlow>
+    <sequenceFlow id="_10" name="灏忎?3澶�" sourceRef="_4" targetRef="userTask2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${day<=3}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_11" name="澶т簬3澶�" sourceRef="_4" targetRef="usertask3">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${day>3}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="_12" sourceRef="userTask2" targetRef="_7"/>
+    <sequenceFlow id="_13" sourceRef="usertask3" targetRef="_7"/>
+  </process>
+  <bpmndi:BPMNDiagram 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" id="Diagram-_1" name="New Diagram">
+    <bpmndi:BPMNPlane bpmnElement="leaveProcess">
+      <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
+        <dc:Bounds height="32.0" width="32.0" x="105.0" y="200.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="usertask1" id="Shape-usertask1">
+        <dc:Bounds height="55.0" width="85.0" x="205.0" y="190.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_4" id="Shape-_4" isMarkerVisible="false">
+        <dc:Bounds height="32.0" width="32.0" x="405.0" y="190.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="userTask2" id="Shape-userTask2">
+        <dc:Bounds height="55.0" width="85.0" x="605.0" y="110.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="usertask3" id="Shape-usertask3">
+        <dc:Bounds height="55.0" width="85.0" x="610.0" y="295.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="_7" id="Shape-_7">
+        <dc:Bounds height="32.0" width="32.0" x="795.0" y="240.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="_13" id="BPMNEdge__13" sourceElement="usertask3" targetElement="_7">
+        <di:waypoint x="695.0" y="322.5"/>
+        <di:waypoint x="795.0" y="256.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_12" id="BPMNEdge__12" sourceElement="userTask2" targetElement="_7">
+        <di:waypoint x="690.0" y="137.5"/>
+        <di:waypoint x="795.0" y="256.0"/>
+        <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="_2" targetElement="usertask1">
+        <di:waypoint x="137.0" y="216.0"/>
+        <di:waypoint x="205.0" y="217.5"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_9" id="BPMNEdge__9" sourceElement="usertask1" targetElement="_4">
+        <di:waypoint x="290.0" y="217.5"/>
+        <di:waypoint x="405.0" y="206.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_11" id="BPMNEdge__11" sourceElement="_4" targetElement="usertask3">
+        <di:waypoint x="437.0" y="206.0"/>
+        <di:waypoint x="610.0" y="322.5"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_10" id="BPMNEdge__10" sourceElement="_4" targetElement="userTask2">
+        <di:waypoint x="437.0" y="206.0"/>
+        <di:waypoint x="605.0" y="137.5"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

atms-api/src/main/resources/conf/conf.properties

@@ -8,6 +8,11 @@ jdbc2_user=${jdbc2_user}
 jdbc2_password=${jdbc2_password}
 jdbc2_admin_db=${jdbc2_admin_db}
 
+workflow_jdbc_url=${workflow_jdbc_url}
+workflow_jdbc_user=${workflow_jdbc_user}
+workflow_jdbc_password=${workflow_jdbc_password}
+workflow_jdbc_admin_db=${workflow_jdbc_admin_db}
+
 jdbc_url_demo=${jdbc_url_demo}
 
 mail_jdbc_url=${mail_jdbc_url}

atms-api/src/main/resources/conf/conf_profile_dev.properties

@@ -9,6 +9,11 @@ jdbc2_user=pwc_invoice
 jdbc2_password=pwc_invoice
 jdbc2_admin_db=pwc_invoice
 
+workflow_jdbc_url=jdbc:oracle:thin:@10.158.230.144:11521:XE
+workflow_jdbc_user=TAX_ADMIN
+workflow_jdbc_password=taxadmin2018
+workflow_jdbc_admin_db=tax_admin
+
 jdbc_url_demo=jdbc:mysql://10.158.230.144:3306/demo_db_name?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 
 mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster

pom.xml

@@ -30,6 +30,7 @@
         <sonar.exclusions>
             **/*Mapper.*,**/*Example.*,**/*Test.java,**/*IT.java,**/*Dto.java,**/atms/entitiy/**/*.java,**/atms/thirdparty/**/*.java,**/atms/common/message/**/*.java,**/atms/dto/**/*.java,**/atms/constant/**/*.java
         </sonar.exclusions>
+        <activiti.version>5.21.0</activiti.version>
     </properties>
 
     <dependencyManagement>