Commit 5c1ec994 by 李小惠

1

parents ae035ce7 495264ff
......@@ -191,7 +191,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
for (Task a:list) {
System.out.println("a = " + a);
}
Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list().get(0);
task.setAssignee(StartUser.getUserId().toString());
return processInstance.getProcessInstanceId();
......
......@@ -586,6 +586,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
@Override
public ApiRes<RecordVO> record(String processInstanceId) {
RecordVO vo=new RecordVO();
String tempID= flowInstanceService.getFormIdByInstanceId(processInstanceId);//先拿到表单id,然后通过表单拿到初始表结构
ProcessTemplates processTemplates = processTemplateService.getById(tempID);
......@@ -607,9 +609,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
List<HistoricActivityInstance> list = historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstanceId).orderByHistoricActivityInstanceStartTime().asc().list();
List<TaskDetailVO> taskDetailVOS= new ArrayList<>();
String userStart = historicProcessInstance.getStartUserId();
// taskDetailVO.setUserId(user.getUserId().toString());
for (HistoricActivityInstance historicActivityInstance : list) {
if("startEvent".equals(historicActivityInstance.getActivityType())){
......@@ -618,8 +617,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
taskDetailVO.setActivityId(historicActivityInstance.getActivityId());
taskDetailVO.setName("发起人");
taskDetailVO.setTaskStatusWrapper("发起");
// taskDetailVO.setUserId(JSONObject.parseObject(userStart, UserInfo.class).getUserId().toString());
// taskDetailVO.setUserName(JSONObject.parseObject(userStart, UserInfo.class).getRealName().toString());
taskDetailVO.setCreateTime(historicActivityInstance.getStartTime());
taskDetailVO.setEndTime(historicActivityInstance.getEndTime());
......
......@@ -204,7 +204,7 @@ public class BpmnConvert {
multiInstanceLoopCharacteristics.setElementVariable("assigneeName");
// 串行
multiInstanceLoopCharacteristics.setSequential(false);
multiInstanceLoopCharacteristics.setCompletionCondition("${nrOfCompletedInstances/nrOfInstances >=1}");
multiInstanceLoopCharacteristics.setCompletionCondition("${nrOfCompletedInstances/nrOfInstances > 0}");
userTask.setAssignee("${assigneeName}");
// 设置多实例属性
userTask.setLoopCharacteristics(multiInstanceLoopCharacteristics);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论