@@ -135,6 +135,7 @@ public class FlowInstance { | |||||
actInst.setId(procInst.getEntityId()); | actInst.setId(procInst.getEntityId()); | ||||
actInst.setPrcId(procDef.getEntityId()); | actInst.setPrcId(procDef.getEntityId()); | ||||
actInst.setActId(start.getId()); | actInst.setActId(start.getId()); | ||||
actInst.setActName(start.getLabel()); | |||||
actInst.setHandler(us.getUserId()); | actInst.setHandler(us.getUserId()); | ||||
actInst.setStartTime(DateUtil.nowDateTimeLong()); | actInst.setStartTime(DateUtil.nowDateTimeLong()); | ||||
actInst.setStatu(FlowConst.ActivityStatu.HANDLE.value); | actInst.setStatu(FlowConst.ActivityStatu.HANDLE.value); | ||||
@@ -643,6 +644,7 @@ public class FlowInstance { | |||||
task.setPriId(procInst.getId()); | task.setPriId(procInst.getId()); | ||||
task.setPriId(procDef.getId()); | task.setPriId(procDef.getId()); | ||||
task.setActId(act.getId()); | task.setActId(act.getId()); | ||||
task.setActName(act.getLabel()); | |||||
task.setStartTime(DateUtil.nowDateTimeLong()); | task.setStartTime(DateUtil.nowDateTimeLong()); | ||||
task.setStatu(FlowConst.ActivityStatu.WAIT.value); | task.setStatu(FlowConst.ActivityStatu.WAIT.value); | ||||
task.setMake(false); | task.setMake(false); | ||||
@@ -57,7 +57,7 @@ public class FlowSingleLoadHandler extends LCSingleLoadHandler implements FlowLi | |||||
ret.put(cardDataset.name, data); | ret.put(cardDataset.name, data); | ||||
//加载流程信息 | //加载流程信息 | ||||
FlowInstance flowInstance = new FlowInstance(this, us); | |||||
flowInstance = new FlowInstance(this, us); | |||||
flowInstance.load(id, taskId); | flowInstance.load(id, taskId); | ||||
ret.put(FlowHelper.DATASET_NAME_FLOW, DynRetBean.createBean(flowInstance.getProcInst())); | ret.put(FlowHelper.DATASET_NAME_FLOW, DynRetBean.createBean(flowInstance.getProcInst())); | ||||
@@ -35,14 +35,14 @@ public class FlowSingleSaveHandler<T extends DefaultEntity> extends LCSingleSave | |||||
data = data.readMap("form"); | data = data.readMap("form"); | ||||
if (data == null) throw new BizException("没有找到待保存的流程数据!"); | if (data == null) throw new BizException("没有找到待保存的流程数据!"); | ||||
FlowInstance flowInstance = new FlowInstance(this, us); | |||||
flowInstance = new FlowInstance(this, us); | |||||
if (bean.isNew()) { | if (bean.isNew()) { | ||||
flowInstance.create(form.getBillType()); | flowInstance.create(form.getBillType()); | ||||
} else { | } else { | ||||
flowInstance.load(id, taskId); | flowInstance.load(id, taskId); | ||||
} | } | ||||
flowInstance.readFromPage(data); | flowInstance.readFromPage(data); | ||||
flowInstance.setBillInfo(getBillCode(), getBillInfo(), getBillUrl()); | |||||
return bean; | return bean; | ||||
} | } | ||||
@@ -51,4 +51,19 @@ public class FlowSingleSaveHandler<T extends DefaultEntity> extends LCSingleSave | |||||
super.saveBean(bean); | super.saveBean(bean); | ||||
flowInstance.save(); | flowInstance.save(); | ||||
} | } | ||||
//单据编号 | |||||
protected String getBillCode() { | |||||
return ""; | |||||
} | |||||
//单据信息,在待办中显示 | |||||
protected String getBillInfo() { | |||||
return ""; | |||||
} | |||||
//单据url,待办中跳链 | |||||
protected String getBillUrl() { | |||||
return ""; | |||||
} | |||||
} | } |