youxiw2000 / trash · Commits

Commit fe47cf28878158088465cd14280d8ed801a3c165

Authored by youxiw2000
1 parent 8fe746ed
build: skipped

m

Inline Side-by-side
Showing 3 changed files with 70 additions and 55 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @fe47cf2
... ... @@ -81,6 +81,8 @@ public class ActTaskServiceImpl implements IActTaskService {
81 81 public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) {
82 82 Page<ActTaskDTO> list = new Page<ActTaskDTO>();
83 83  
  84 +// tasks(pageable,TaskPayloadBuilder.tasks().withAssignee(authenticatedUserId).withGroups(userGroups).build());
  85 +
84 86 org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
85 87 List<Task> tasks = pageTasks.getContent();
86 88 int totalItems = pageTasks.getTotalItems();
... ... @@ -245,14 +247,14 @@ public class ActTaskServiceImpl implements IActTaskService {
245 247 }
246 248  
247 249  
248   - List<org.activiti.engine.task.Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list(); //测试 当前用户为审批用户
249   -
250   - for(org.activiti.engine.task.Task task1 : tasks){ //测试 当前用户为审批用户
251   - if(task1.getAssignee() == null){
252   - task1.setAssignee(SecurityUtils.getUsername());
253   - taskService.saveTask(task1);
254   - }
255   - }
  250 +// List<org.activiti.engine.task.Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list(); //测试 当前用户为审批用户
  251 +//
  252 +// for(org.activiti.engine.task.Task task1 : tasks){ //测试 当前用户为审批用户
  253 +// if(task1.getAssignee() == null){
  254 +// task1.setAssignee(SecurityUtils.getUsername());
  255 +// taskService.saveTask(task1);
  256 +// }
  257 +// }
256 258  
257 259 // 写入数据库
258 260 return actWorkflowFormDataService.insertActWorkflowFormDatas(acwfds);
... ...
trash-ui/public/bpmnjs/index.js
  View file @fe47cf2
... ... @@ -40,22 +40,23 @@ var _newDiagram = _interopRequireDefault(require(&quot;../resources/newDiagram.bpmn&quot;)
40 40 }
41 41 });
42 42  
43   - // _jquery.default.ajax({
44   - // url: localStorage.getItem("VUE_APP_BASE_API") + '/system/user/all',
45   - // // url: 'http://localhost:8080/processDefinition/getDefinitionXML',
46   - // type: 'GET',
47   - // data: {},
48   - // dataType: 'json',
49   - // success: function (result) {
50   - // let i;
51   - // for(i=0;i<result.data.length;i++){
52   - // users.push({value:result.data[i].userName,"name":result.data[i].nickName});
53   - // }
54   - // },
55   - // error: function (err) {
56   - // console.log(err);
57   - // }
58   - // });
  43 + _jquery.default.ajax({
  44 + url: '/api/gpsservice/cs/dataDict',
  45 + headers:{Authorization:"Bearer auth:token:" + sessionStorage.getItem('Admin-Token')},
  46 + // url: 'http://localhost:8080/processDefinition/getDefinitionXML',
  47 + type: 'GET',
  48 + data: {type:"CSUserDeparmentType"},
  49 + dataType: 'json',
  50 + success: function (result) {
  51 + let i;
  52 + for(i=0;i<result.result.length;i++){
  53 + users.push({value:result.result[i].code,"name":result.result[i].name});
  54 + }
  55 + },
  56 + error: function (err) {
  57 + console.log(err);
  58 + }
  59 + });
59 60  
60 61 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
61 62  
... ... @@ -77358,7 +77359,7 @@ var _default = {
77358 77359 'Configure Connector': '配置连接器',
77359 77360 'Input Parameter': '输入参数',
77360 77361 'Assignee': '代理人',
77361   - 'Candidate Users': '候选用户',
  77362 + 'Candidate Users': '候选部门',
77362 77363 'Candidate Groups': '候选组',
77363 77364 'Due Date': '到期时间',
77364 77365 'Follow Up Date': '跟踪日期',
... ... @@ -84625,19 +84626,19 @@ module.exports = function(group, element, translate) {
84625 84626 if (is(element, 'activiti:Assignable')) {
84626 84627  
84627 84628 // Assignee
84628   - group.entries.push(entryFactory.textField({
84629   - id : 'assignee',
84630   - label : translate('Assignee'),
84631   - modelProperty : 'assignee'
84632   - }));
  84629 + // group.entries.push(entryFactory.textField({
  84630 + // id : 'assignee',
  84631 + // label : translate('Assignee'),
  84632 + // modelProperty : 'assignee'
  84633 + // }));
84633 84634  
84634 84635 // Candidate Users
84635   - // group.entries.push(entryFactory.selectBox({
84636   - // id : 'candidateUsers',
84637   - // label : translate('Candidate Users'),
84638   - // modelProperty : 'candidateUsers',
84639   - // selectOptions:users
84640   - // }));
  84636 + group.entries.push(entryFactory.selectBox({
  84637 + id : 'candidateUsers',
  84638 + label : translate('Candidate Users'),
  84639 + modelProperty : 'candidateUsers',
  84640 + selectOptions:users
  84641 + }));
84641 84642  
84642 84643 // Candidate Groups
84643 84644 group.entries.push(entryFactory.selectBox({
... ...
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @fe47cf2
... ... @@ -7,7 +7,15 @@ import java.util.stream.Collectors;
7 7  
8 8 import org.activiti.api.process.model.ProcessInstance;
9 9 import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
  10 +import org.activiti.api.process.model.payloads.StartProcessPayload;
10 11 import org.activiti.api.process.runtime.ProcessRuntime;
  12 +import org.activiti.api.task.model.builders.DeleteTaskPayloadBuilder;
  13 +import org.activiti.api.task.model.payloads.DeleteTaskPayload;
  14 +import org.activiti.api.task.runtime.TaskRuntime;
  15 +import org.activiti.engine.ManagementService;
  16 +import org.activiti.engine.ProcessEngine;
  17 +import org.activiti.engine.RepositoryService;
  18 +import org.activiti.engine.RuntimeService;
11 19 import org.activiti.engine.TaskService;
12 20 import org.activiti.engine.task.Task;
13 21 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -43,10 +51,17 @@ public class WorkflowServiceImpl implements IWorkflowService {
43 51 @Autowired
44 52 private TaskService taskService;
45 53  
  54 + @Autowired
  55 + private TaskRuntime taskRuntime;
  56 +
46 57 String siteType[] = {"消纳场","建筑垃圾资源化处置场","盾构土环保处置场","盾构土应急消纳场","回填场"};
47 58  
48 59 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
49 60  
  61 +
  62 + @Autowired
  63 + RuntimeService runTImeService;
  64 +
50 65 @Override
51 66 @Transactional
52 67 public int createWorkFlow(Map<String,Object> data) {
... ... @@ -66,20 +81,20 @@ public class WorkflowServiceImpl implements IWorkflowService {
66 81  
67 82 try {
68 83  
69   - processInstance = processRuntime.start(ProcessPayloadBuilder
  84 +
  85 + processInstance = processRuntime.start(ProcessPayloadBuilder
70 86 .start()
71 87 .withProcessDefinitionKey(flowType)
72 88 .withName(title)
73 89 .withBusinessKey(businessKey)
  90 + .withVariable("route", 3)
74 91 .build());
75 92  
76   - List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
77   -
78   -// for(Task task : tasks){ //测试 当前用户为审批用户
79   -// task.setAssignee(SecurityUtils.getUsername());
80   -// taskService.saveTask(task);
81   -// }
82   -
  93 +// Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
  94 +//
  95 +// task.setAssignee(SecurityUtils.getUsername());
  96 +//
  97 +// taskService.saveTask(task);
83 98  
84 99  
85 100 Workflow workflow = new Workflow();
... ... @@ -131,11 +146,8 @@ public class WorkflowServiceImpl implements IWorkflowService {
131 146 .build());
132 147  
133 148 List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
134   -
135   -// for(Task task : tasks){ //测试 当前用户为审批用户
136   -// task.setAssignee(SecurityUtils.getUsername());
137   -// taskService.saveTask(task);
138   -// }
  149 +
  150 +
139 151  
140 152  
141 153  
... ... @@ -172,12 +184,12 @@ public class WorkflowServiceImpl implements IWorkflowService {
172 184 .withBusinessKey("workflow_threestep:" + supervision.getId())
173 185 .build());
174 186  
175   - List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
176   -
177   - for(Task task : tasks){ //测试 当前用户为审批用户
178   - task.setAssignee(SecurityUtils.getUsername());
179   - taskService.saveTask(task);
180   - }
  187 +// List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
  188 +//
  189 +// for(Task task : tasks){ //测试 当前用户为审批用户
  190 +// task.setAssignee(SecurityUtils.getUsername());
  191 +// taskService.saveTask(task);
  192 +// }
181 193  
182 194 Workflow workflow = new Workflow();
183 195 workflow.setId("workflow_threestep:" + supervision.getId());
... ...