m

youxiw2000
1 parent 8fe746ed
Showing 3 changed files with 70 additions and 55 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-ui/public/bpmnjs/index.js
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
@@ -81,6 +81,8 @@ public class ActTaskServiceImpl implements IActTaskService {
 	public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) {
 		Page<ActTaskDTO> list = new Page<ActTaskDTO>();
+//		tasks(pageable,TaskPayloadBuilder.tasks().withAssignee(authenticatedUserId).withGroups(userGroups).build());
+		
 		org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
 		List<Task> tasks = pageTasks.getContent();
 		int totalItems = pageTasks.getTotalItems();
@@ -245,14 +247,14 @@ public class ActTaskServiceImpl implements IActTaskService {
 		}		
-    	List<org.activiti.engine.task.Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list(); //测试 当前用户为审批用户
-    	
-    	for(org.activiti.engine.task.Task task1 : tasks){ //测试 当前用户为审批用户
-    		if(task1.getAssignee() == null){
-		    	task1.setAssignee(SecurityUtils.getUsername());
-		    	taskService.saveTask(task1);
-    		}
-    	}
+//    	List<org.activiti.engine.task.Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list(); //测试 当前用户为审批用户
+//    	
+//    	for(org.activiti.engine.task.Task task1 : tasks){ //测试 当前用户为审批用户
+//    		if(task1.getAssignee() == null){
+//		    	task1.setAssignee(SecurityUtils.getUsername());
+//		    	taskService.saveTask(task1);
+//    		}
+//    	}
 		// 写入数据库
 		return actWorkflowFormDataService.insertActWorkflowFormDatas(acwfds);
@@ -40,22 +40,23 @@ var _newDiagram = _interopRequireDefault(require(&quot;../resources/newDiagram.bpmn&quot;)
     }
   });
-  // _jquery.default.ajax({
-  //   url: localStorage.getItem("VUE_APP_BASE_API") + '/system/user/all',
-  //   // url: 'http://localhost:8080/processDefinition/getDefinitionXML',
-  //   type: 'GET',
-  //   data: {},
-  //   dataType: 'json',
-  //   success: function (result) {
-  //     let i;
-  //     for(i=0;i<result.data.length;i++){
-  //       users.push({value:result.data[i].userName,"name":result.data[i].nickName});
-  //     }
-  //   },
-  //   error: function (err) {
-  //     console.log(err);
-  //   }
-  // });
+  _jquery.default.ajax({
+    url: '/api/gpsservice/cs/dataDict',
+    headers:{Authorization:"Bearer auth:token:" + sessionStorage.getItem('Admin-Token')},
+    // url: 'http://localhost:8080/processDefinition/getDefinitionXML',
+    type: 'GET',
+    data: {type:"CSUserDeparmentType"},
+    dataType: 'json',
+    success: function (result) {
+      let i;
+      for(i=0;i<result.result.length;i++){
+        users.push({value:result.result[i].code,"name":result.result[i].name});
+      }
+    },
+    error: function (err) {
+      console.log(err);
+    }
+  });
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -77358,7 +77359,7 @@ var _default = {
   'Configure Connector': '配置连接器',
   'Input Parameter': '输入参数',
   'Assignee': '代理人',
-  'Candidate Users': '候选用户',
+  'Candidate Users': '候选部门',
   'Candidate Groups': '候选组',
   'Due Date': '到期时间',
   'Follow Up Date': '跟踪日期',
@@ -84625,19 +84626,19 @@ module.exports = function(group, element, translate) {
   if (is(element, 'activiti:Assignable')) {
     // Assignee
-    group.entries.push(entryFactory.textField({
-      id : 'assignee',
-      label : translate('Assignee'),
-      modelProperty : 'assignee'
-    }));
+    // group.entries.push(entryFactory.textField({
+    //   id : 'assignee',
+    //   label : translate('Assignee'),
+    //   modelProperty : 'assignee'
+    // }));
     // Candidate Users
-    // group.entries.push(entryFactory.selectBox({
-    //   id : 'candidateUsers',
-    //   label : translate('Candidate Users'),
-    //   modelProperty : 'candidateUsers',
-    //   selectOptions:users
-    // }));
+    group.entries.push(entryFactory.selectBox({
+      id : 'candidateUsers',
+      label : translate('Candidate Users'),
+      modelProperty : 'candidateUsers',
+      selectOptions:users
+    }));
     // Candidate Groups
     group.entries.push(entryFactory.selectBox({
@@ -7,7 +7,15 @@ import java.util.stream.Collectors;
 import org.activiti.api.process.model.ProcessInstance;
 import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
+import org.activiti.api.process.model.payloads.StartProcessPayload;
 import org.activiti.api.process.runtime.ProcessRuntime;
+import org.activiti.api.task.model.builders.DeleteTaskPayloadBuilder;
+import org.activiti.api.task.model.payloads.DeleteTaskPayload;
+import org.activiti.api.task.runtime.TaskRuntime;
+import org.activiti.engine.ManagementService;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,10 +51,17 @@ public class WorkflowServiceImpl implements IWorkflowService {
     @Autowired
     private TaskService taskService;
+    @Autowired
+    private TaskRuntime taskRuntime;
+    
     String siteType[] = {"消纳场","建筑垃圾资源化处置场","盾构土环保处置场","盾构土应急消纳场","回填场"};
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+    
+    @Autowired
+    RuntimeService runTImeService;
+    
     @Override
     @Transactional
     public int createWorkFlow(Map<String,Object> data) {
@@ -66,20 +81,20 @@ public class WorkflowServiceImpl implements IWorkflowService {
     	try {
-	    	processInstance = processRuntime.start(ProcessPayloadBuilder
+    		
+    		processInstance = processRuntime.start(ProcessPayloadBuilder
 	                .start()
 	                .withProcessDefinitionKey(flowType)
 	                .withName(title)
 	                .withBusinessKey(businessKey)
+	                .withVariable("route", 3)
 	                .build());
-	    	List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
-	    		    	
-//	    	for(Task task : tasks){ //测试 当前用户为审批用户
-//		    	task.setAssignee(SecurityUtils.getUsername());
-//		    	taskService.saveTask(task);
-//	    	}
-	    	
+//	    	Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+//    			   
+//	    	task.setAssignee(SecurityUtils.getUsername());
+//	    	
+//	    	taskService.saveTask(task);
 	    	Workflow workflow = new Workflow();
@@ -131,11 +146,8 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	                .build());
 	    	List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
-	    		    	
-//	    	for(Task task : tasks){ //测试 当前用户为审批用户
-//		    	task.setAssignee(SecurityUtils.getUsername());
-//		    	taskService.saveTask(task);
-//	    	}
+	    		   
+	    	
@@ -172,12 +184,12 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	                .withBusinessKey("workflow_threestep:" + supervision.getId())
 	                .build());
-		    	List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
-		    	
-		    	for(Task task : tasks){ //测试 当前用户为审批用户
-			    	task.setAssignee(SecurityUtils.getUsername());
-			    	taskService.saveTask(task);
-		    	}
+//		    	List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
+//		    	
+//		    	for(Task task : tasks){ //测试 当前用户为审批用户
+//			    	task.setAssignee(SecurityUtils.getUsername());
+//			    	taskService.saveTask(task);
+//		    	}
 		    	Workflow workflow = new Workflow();
 		    	workflow.setId("workflow_threestep:" + supervision.getId());