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

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_BO_CN_base.ts

@@ -13,6 +13,8 @@ function getLocaleResourceBase(){
 		startuserid: commonLogic.appcommonhandle("发起人标识",null),
 		startusername: commonLogic.appcommonhandle("发起人",null),
 		processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
+		wfusers: commonLogic.appcommonhandle("步骤用户",null),
+		taskdefinitionkey: commonLogic.appcommonhandle("步骤标记",null),
 	},
 		views: {
 			activeinstancegridview: {

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_en_US_base.ts

@@ -13,6 +13,8 @@ function getLocaleResourceBase(){
 		startuserid: commonLogic.appcommonhandle("发起人标识",null),
 		startusername: commonLogic.appcommonhandle("发起人",null),
 		processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
+		wfusers: commonLogic.appcommonhandle("步骤用户",null),
+		taskdefinitionkey: commonLogic.appcommonhandle("步骤标记",null),
 	},
 		views: {
 			activeinstancegridview: {

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_zh_CN_base.ts

@@ -13,6 +13,8 @@ function getLocaleResourceBase(){
 		startuserid: commonLogic.appcommonhandle("发起人标识",null),
 		startusername: commonLogic.appcommonhandle("发起人",null),
 		processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
+		wfusers: commonLogic.appcommonhandle("步骤用户",null),
+		taskdefinitionkey: commonLogic.appcommonhandle("步骤标记",null),
 	},
 		views: {
 			activeinstancegridview: {

app_web/src/widgets/wfprocess-instance/jump-form/jump-form-base.vue

@@ -509,7 +509,7 @@ export default class JumpBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof JumpBase
      */
-    public majorMessageField: string = "wfusers";
+    public majorMessageField: string = "";
 
     /**
      * 值规则

app_web/src/widgets/wfprocess-instance/jump-form/jump-form-model.ts

@@ -52,12 +52,12 @@ export default class JumpModel {
       },
       {
         name: 'taskdefinitionname',
-        prop: 'processdefinitionkey',
+        prop: 'taskdefinitionkey',
         dataType: 'TEXT',
       },
       {
         name: 'wfusers',
-        prop: 'name',
+        prop: 'wfusers',
         dataType: 'TEXT',
       },
       {

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessInstance.java

@@ -126,6 +126,22 @@ public class WFProcessInstance extends EntityBase implements Serializable {
     @ApiModelProperty("DefinitionId")
     private String processdefinitionid;
 
+    /**
+     * 步骤用户
+     */
+    @JSONField(name = "wfusers")
+    @JsonProperty("wfusers")
+    @ApiModelProperty("步骤用户")
+    private String wfusers;
+
+    /**
+     * 步骤标记
+     */
+    @JSONField(name = "taskDefinitionKey")
+    @JsonProperty("taskDefinitionKey")
+    @ApiModelProperty("步骤标记")
+    private String taskdefinitionkey;
+
 
 
 

ibzwf-core/src/main/resources/sysmodel/ibzwf.json

@@ -717,6 +717,34 @@
     "key_field":0,
     "show_order":10,
     "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":[

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/dto/WFProcessInstanceDTO.java

@@ -132,6 +132,26 @@ public class WFProcessInstanceDTO extends DTOBase implements Serializable {
     @ApiModelProperty("DefinitionId")
     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]