Browse Source

流程:按钮控制

4.0
郑根木 2 years ago
parent
commit
692a122dca
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java

+ 4
- 3
smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java View File

@@ -375,7 +375,7 @@ public class FlowInstance {
boolean hasMake = false; boolean hasMake = false;
for (Task act : listTask) { for (Task act : listTask) {
SwMap row = new SwMap(); SwMap row = new SwMap();
tasks.add(row);
bTasks.add(row);
row.put("id", act.getId()); row.put("id", act.getId());
row.put("label", procDef.getProcInfo().getActNameById(act.getActId())); row.put("label", procDef.getProcInfo().getActNameById(act.getActId()));
if (act.isMake()) { if (act.isMake()) {
@@ -387,14 +387,15 @@ public class FlowInstance {
} }
if (!hasMake && procDef.getProcInfo().isRejectToMake()) { if (!hasMake && procDef.getProcInfo().isRejectToMake()) {
SwMap row = new SwMap(); SwMap row = new SwMap();
tasks.add(0, row);
bTasks.add(0, row);
Task act = provider.findMakeTask(procInst.getId()); Task act = provider.findMakeTask(procInst.getId());
row.put("id", act.getId()); row.put("id", act.getId());
row.put("label", procDef.getProcInfo().getActNameById(act.getActId())); row.put("label", procDef.getProcInfo().getActNameById(act.getActId()));
row.put("type", 0); row.put("type", 0);
} }
extra.put("preTasks", bTasks);
} }
extra.put("preTasks", tasks);
List<SwMap> buttons = new ArrayList<>(); List<SwMap> buttons = new ArrayList<>();
resetButtons(buttons); resetButtons(buttons);
extra.put("buttons", buttons); extra.put("buttons", buttons);


Loading…
Cancel
Save