|
|
@@ -46,8 +46,6 @@ public class FlowInstance { |
|
|
|
//流程执行变量 |
|
|
|
// public Map<String, String> variables = new HashMap<>(); |
|
|
|
|
|
|
|
//当前任务 |
|
|
|
private List<Map<String, String>> tasks = new ArrayList<>(); |
|
|
|
//数据提供者 |
|
|
|
private FlowProvider provider = new FlowProvider(); |
|
|
|
|
|
|
@@ -342,24 +340,27 @@ public class FlowInstance { |
|
|
|
/** |
|
|
|
* 返回页面前的设置 |
|
|
|
*/ |
|
|
|
public void resetPage() { |
|
|
|
public void setPageRetExtra(SwMap ret) { |
|
|
|
SwMap extra = ret.computeMapIfAbsent("extra", k->new SwMap()); |
|
|
|
|
|
|
|
List<Task> listTask = adjustTasks(); |
|
|
|
//可选步骤 |
|
|
|
tasks.clear(); |
|
|
|
List<SwMap> tasks = new ArrayList<>(); |
|
|
|
String next_text = procDef.getProcInfo().getActNameById(actInst.getActId()); |
|
|
|
int index = 0; |
|
|
|
for (Task act : listTask) { |
|
|
|
Map<String, String> row = new HashMap<>(); |
|
|
|
SwMap row = new SwMap(); |
|
|
|
tasks.add(row); |
|
|
|
row.put("id", String.valueOf(act.getId())); |
|
|
|
row.put("id", act.getId()); |
|
|
|
if (act.getId() == actInst.getId() && listTask.size() > 1 && index != 0) { |
|
|
|
next_text = "待" + next_text; |
|
|
|
} else { |
|
|
|
next_text = procDef.getProcInfo().getActNameById(act.getActId()); |
|
|
|
} |
|
|
|
row.put("text", next_text); |
|
|
|
row.put("label", next_text); |
|
|
|
index++; |
|
|
|
} |
|
|
|
extra.put("tasks", tasks); |
|
|
|
resetButtons(); |
|
|
|
} |
|
|
|
|
|
|
|