yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善驳回功能

master
yxt_djz 2 years ago
parent
cbbc235e1f
commit
10e2ad45b6
1 changed files with 12 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

20
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
View File

@ -1292,13 +1292,16 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
.moveActivityIdsToSingleActivityId(currentIds, targetIds.get(0)).changeState(); .moveActivityIdsToSingleActivityId(currentIds, targetIds.get(0)).changeState();
} }
// 最近环节 // 最近环节
parentUserTaskList.forEach(item -> { for(UserTask item:parentUserTaskList){
Map<String, Object> map2 = flowTaskMapper.getTaskByDefKey(task.getProcessInstanceId(), targetIds.get(0)); Map<String, Object> map2 = flowTaskMapper.getTaskByDefKey(task.getProcessInstanceId(), targetIds.get(0));
Map<String, Object> map = flowTaskMapper.getHistTaskByID(task.getProcessInstanceId(), targetIds.get(0)); Map<String, Object> map = flowTaskMapper.getHistTaskByID(task.getProcessInstanceId(), targetIds.get(0));
String assignee_ =item.getAssignee(); String assignee_ =item.getAssignee();
if(map.get("ASSIGNEE_")!=null){ if(map.get("ASSIGNEE_")!=null){
assignee_ = map.get("ASSIGNEE_").toString(); assignee_ = map.get("ASSIGNEE_").toString();
} }
if(map2==null){
continue;
}
String id_ = map2.get("id_").toString(); String id_ = map2.get("id_").toString();
ResultBean<List<LatestTaskVo>> listResultBean_2=null; ResultBean<List<LatestTaskVo>> listResultBean_2=null;
if(flowTaskVo.getUserSid().equals(assignee_)){ if(flowTaskVo.getUserSid().equals(assignee_)){
@ -1310,14 +1313,15 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
taskService.setAssignee(id_, assignee_); taskService.setAssignee(id_, assignee_);
} }
LatestTaskVo latestTaskVo = new LatestTaskVo(); LatestTaskVo latestTaskVo = new LatestTaskVo();
latestTaskVo.setASSIGNEE_(item.getAssignee()); latestTaskVo.setASSIGNEE_(item.getAssignee());
latestTaskVo.setId_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getId_():id_); latestTaskVo.setId_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getId_():id_);
latestTaskVo.setName_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getName_():item.getName()); latestTaskVo.setName_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getName_():item.getName());
latestTaskVo.setTask_def_key_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getTask_def_key_():item.getId()); latestTaskVo.setTask_def_key_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getTask_def_key_():item.getId());
latestTaskVo.setIncomingSourceRef(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getIncomingSourceRef():item.getIncomingFlows().get(0).getSourceRef()); latestTaskVo.setIncomingSourceRef(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getIncomingSourceRef():item.getIncomingFlows().get(0).getSourceRef());
latestTaskVo.setOrgPath(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getOrgPath():orgPath); latestTaskVo.setOrgPath(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getOrgPath():orgPath);
latestTaskList.add(latestTaskVo); latestTaskList.add(latestTaskVo);
}); }
} catch (FlowableObjectNotFoundException e) { } catch (FlowableObjectNotFoundException e) {
throw new CustomException("未找到流程实例，流程可能已发生变化"); throw new CustomException("未找到流程实例，流程可能已发生变化");
} catch (FlowableException e) { } catch (FlowableException e) {

Write Preview
Loading…
Cancel
Save