From acfb4a1af5b573bd6db481d264e5c7e862c97f0d Mon Sep 17 00:00:00 2001 From: zhenggm Date: Thu, 1 Sep 2022 10:29:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=BC=95=E6=93=8E-=E4=BF=9D?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/bpm/web/engine/flow/FlowInstance.java | 2 ++ .../flow/listcard/single/FlowSingleLoadHandler.java | 2 +- .../flow/listcard/single/FlowSingleSaveHandler.java | 19 +++++++++++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java index 22dd392..5e61dfb 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java @@ -135,6 +135,7 @@ public class FlowInstance { actInst.setId(procInst.getEntityId()); actInst.setPrcId(procDef.getEntityId()); actInst.setActId(start.getId()); + actInst.setActName(start.getLabel()); actInst.setHandler(us.getUserId()); actInst.setStartTime(DateUtil.nowDateTimeLong()); actInst.setStatu(FlowConst.ActivityStatu.HANDLE.value); @@ -643,6 +644,7 @@ public class FlowInstance { task.setPriId(procInst.getId()); task.setPriId(procDef.getId()); task.setActId(act.getId()); + task.setActName(act.getLabel()); task.setStartTime(DateUtil.nowDateTimeLong()); task.setStatu(FlowConst.ActivityStatu.WAIT.value); task.setMake(false); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java index 589e7b7..d19cb26 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java @@ -57,7 +57,7 @@ public class FlowSingleLoadHandler extends LCSingleLoadHandler implements FlowLi ret.put(cardDataset.name, data); //加载流程信息 - FlowInstance flowInstance = new FlowInstance(this, us); + flowInstance = new FlowInstance(this, us); flowInstance.load(id, taskId); ret.put(FlowHelper.DATASET_NAME_FLOW, DynRetBean.createBean(flowInstance.getProcInst())); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleSaveHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleSaveHandler.java index 5e616ac..f1ce123 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleSaveHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleSaveHandler.java @@ -35,14 +35,14 @@ public class FlowSingleSaveHandler extends LCSingleSave data = data.readMap("form"); if (data == null) throw new BizException("没有找到待保存的流程数据！"); - FlowInstance flowInstance = new FlowInstance(this, us); + flowInstance = new FlowInstance(this, us); if (bean.isNew()) { flowInstance.create(form.getBillType()); } else { flowInstance.load(id, taskId); } flowInstance.readFromPage(data); - + flowInstance.setBillInfo(getBillCode(), getBillInfo(), getBillUrl()); return bean; } @@ -51,4 +51,19 @@ public class FlowSingleSaveHandler extends LCSingleSave super.saveBean(bean); flowInstance.save(); } + + //单据编号 + protected String getBillCode() { + return ""; + } + + //单据信息，在待办中显示 + protected String getBillInfo() { + return ""; + } + + //单据url，待办中跳链 + protected String getBillUrl() { + return ""; + } }