提交 c38112e2 编写于 作者: ibizdev's avatar ibizdev

zhouweidong 发布系统代码 [ibz-wf,统一工作流]

上级 2c9e0399
...@@ -13,6 +13,8 @@ function getLocaleResourceBase(){ ...@@ -13,6 +13,8 @@ function getLocaleResourceBase(){
startuserid: commonLogic.appcommonhandle("发起人标识",null), startuserid: commonLogic.appcommonhandle("发起人标识",null),
startusername: commonLogic.appcommonhandle("发起人",null), startusername: commonLogic.appcommonhandle("发起人",null),
processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null), processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
wfusers: commonLogic.appcommonhandle("步骤用户",null),
taskdefinitionkey: commonLogic.appcommonhandle("步骤标记",null),
}, },
views: { views: {
activeinstancegridview: { activeinstancegridview: {
......
...@@ -13,6 +13,8 @@ function getLocaleResourceBase(){ ...@@ -13,6 +13,8 @@ function getLocaleResourceBase(){
startuserid: commonLogic.appcommonhandle("发起人标识",null), startuserid: commonLogic.appcommonhandle("发起人标识",null),
startusername: commonLogic.appcommonhandle("发起人",null), startusername: commonLogic.appcommonhandle("发起人",null),
processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null), processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
wfusers: commonLogic.appcommonhandle("步骤用户",null),
taskdefinitionkey: commonLogic.appcommonhandle("步骤标记",null),
}, },
views: { views: {
activeinstancegridview: { activeinstancegridview: {
......
...@@ -13,6 +13,8 @@ function getLocaleResourceBase(){ ...@@ -13,6 +13,8 @@ function getLocaleResourceBase(){
startuserid: commonLogic.appcommonhandle("发起人标识",null), startuserid: commonLogic.appcommonhandle("发起人标识",null),
startusername: commonLogic.appcommonhandle("发起人",null), startusername: commonLogic.appcommonhandle("发起人",null),
processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null), processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
wfusers: commonLogic.appcommonhandle("步骤用户",null),
taskdefinitionkey: commonLogic.appcommonhandle("步骤标记",null),
}, },
views: { views: {
activeinstancegridview: { activeinstancegridview: {
......
...@@ -509,7 +509,7 @@ export default class JumpBase extends Vue implements ControlInterface { ...@@ -509,7 +509,7 @@ export default class JumpBase extends Vue implements ControlInterface {
* @type {string} * @type {string}
* @memberof JumpBase * @memberof JumpBase
*/ */
public majorMessageField: string = "wfusers"; public majorMessageField: string = "";
/** /**
* 值规则 * 值规则
......
...@@ -52,12 +52,12 @@ export default class JumpModel { ...@@ -52,12 +52,12 @@ export default class JumpModel {
}, },
{ {
name: 'taskdefinitionname', name: 'taskdefinitionname',
prop: 'processdefinitionkey', prop: 'taskdefinitionkey',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'wfusers', name: 'wfusers',
prop: 'name', prop: 'wfusers',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
......
...@@ -126,6 +126,22 @@ public class WFProcessInstance extends EntityBase implements Serializable { ...@@ -126,6 +126,22 @@ public class WFProcessInstance extends EntityBase implements Serializable {
@ApiModelProperty("DefinitionId") @ApiModelProperty("DefinitionId")
private String processdefinitionid; private String processdefinitionid;
/**
* 步骤用户
*/
@JSONField(name = "wfusers")
@JsonProperty("wfusers")
@ApiModelProperty("步骤用户")
private String wfusers;
/**
* 步骤标记
*/
@JSONField(name = "taskDefinitionKey")
@JsonProperty("taskDefinitionKey")
@ApiModelProperty("步骤标记")
private String taskdefinitionkey;
......
...@@ -717,6 +717,34 @@ ...@@ -717,6 +717,34 @@
"key_field":0, "key_field":0,
"show_order":10, "show_order":10,
"major_field":0 "major_field":0
},
{
"fieldname":"WFUSERS" ,
"codename":"Wfusers",
"field_logic_name":"步骤用户",
"entity_name":"WF_INSTANCE",
"field_type":"TEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":11,
"major_field":0
},
{
"fieldname":"TASKDEFINITIONKEY" ,
"codename":"TaskDefinitionKey",
"field_logic_name":"步骤标记",
"entity_name":"WF_INSTANCE",
"field_type":"TEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":12,
"major_field":0
} }
], ],
"subEntitys":[ "subEntitys":[
......
...@@ -132,6 +132,26 @@ public class WFProcessInstanceDTO extends DTOBase implements Serializable { ...@@ -132,6 +132,26 @@ public class WFProcessInstanceDTO extends DTOBase implements Serializable {
@ApiModelProperty("DefinitionId") @ApiModelProperty("DefinitionId")
private String processdefinitionid; private String processdefinitionid;
/**
* 属性 [WFUSERS]
*
*/
@JSONField(name = "wfusers")
@JsonProperty("wfusers")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("步骤用户")
private String wfusers;
/**
* 属性 [TASKDEFINITIONKEY]
*
*/
@JSONField(name = "taskdefinitionkey")
@JsonProperty("taskdefinitionkey")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("步骤标记")
private String taskdefinitionkey;
/** /**
* 设置 [INSTANCENAME] * 设置 [INSTANCENAME]
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册