修正动态实体支持，测试通过TestBeeflowCase

nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/execute/AutoTestCaseDataBaseInitializer.java

@@ -105,7 +105,7 @@ void createTable(IDialect dialect, IEntityModel entityModel) {
             jdbcTemplate.executeUpdate(new SQL(sql));
         } catch (NopException e) {
             if (e.getErrorCode().equals(DaoErrors.ERR_SQL_BAD_SQL_GRAMMAR.getErrorCode())) {
-                LOG.debug("nop.create-table-fail:{}", e);
+                LOG.debug("nop.create-table-fail:{}", entityModel.getTableName(), e);
                 return;
             }
             LOG.error("nop.create-table-fail:{}", entityModel.getTableName(), e);

nop-orm/src/main/java/io/nop/orm/persister/EntityPersisterImpl.java

@@ -119,8 +119,10 @@ public void generateId(IOrmEntity entity) {
     @Override
     public IOrmEntity newEntity(IOrmSessionImplementor session) {
         IOrmEntity entity = (IOrmEntity) constructor.newInstance();
-        entity.orm_attach(session);
+        entity.orm_entityModel(entityModel);
+        // 需要在attach之前设置值，否则实体会被标记为dirty
         bindFilter(entity);
+        entity.orm_attach(session);
         return entity;
     }
 

nop-orm/src/main/java/io/nop/orm/sql/GenSqlHelper.java

@@ -618,7 +618,7 @@ private static void addFixedFilter(boolean prependAnd, SQL.SqlBuilder sb, IDiale
                 if (prependAnd)
                     sb.and();
                 OrmColumnModel col = filter.getColumn();
-                appendEq(sb, dialect, owner, col, binders[col.getPropId()], filter.getValue());
+                appendEq(sb, dialect, owner, col, null, filter.getValue());
                 if (!prependAnd)
                     sb.and();
             });

nop-orm/src/main/java/io/nop/orm/support/DynamicOrmKeyValueTable.java

@@ -24,14 +24,14 @@ public void setFieldName(String fieldName) {
 
     @Override
     public Integer getFieldType() {
-        int propId = orm_propId(OrmConstants.PROP_NAME_fieldName);
+        int propId = orm_propId(OrmConstants.PROP_NAME_fieldType);
         return ConvertHelper.toInteger(orm_propValue(propId),
                 err -> this.newError(err).param(ARG_PROP_NAME, OrmConstants.PROP_NAME_fieldType));
     }
 
     @Override
     public void setFieldType(Integer fieldType) {
-        int propId = orm_propId(OrmConstants.PROP_NAME_fieldName);
+        int propId = orm_propId(OrmConstants.PROP_NAME_fieldType);
         orm_propValue(propId, fieldType);
     }
 

nop-orm/src/main/resources/_vfs/nop/orm/xlib/orm-gen.xlib

@@ -195,7 +195,9 @@
 
                 <!-- 自动生成一个扩展表配置 -->
                 <entity name="${entityNode.getAttr('name')}Ext" tableName="${entityNode.getAttr('tableName')}_ext"
-                        className="io.nop.orm.support.DynamicOrmKeyValueTable"
+                        className="io.nop.orm.support.DynamicOrmKeyValueTable" versionProp="version"
+                        createTimeProp="createTime" createrProp="createdBy" tagSet="kv-table"
+                        updateTimeProp="updateTime" updaterProp="updatedBy" notGenCode="true"
                         displayName="扩展属性" i18n-en:displayName="Extension Fields" xpl:if="genExtTable"
                 >
                     <columns>

nop-wf/deploy/sql/mysql/_create_nop-wf.sql

@@ -119,11 +119,11 @@ CREATE TABLE nop_wf_dyn_entity(
   OBJ_TYPE VARCHAR(100) NOT NULL    COMMENT '对象类型',
   NAME VARCHAR(100) NOT NULL    COMMENT '名称',
   DISPLAY_NAME VARCHAR(500) NULL    COMMENT '显示名称',
-  SORT_ORDER INTEGER NOT NULL    COMMENT '排序',
+  SORT_ORDER INTEGER NULL    COMMENT '排序',
   NOP_FLOW_ID VARCHAR(32) NULL    COMMENT '工作流实例ID',
-  BIZ_STATUS INTEGER NOT NULL    COMMENT '业务状态码',
+  BIZ_STATUS INTEGER NULL    COMMENT '业务状态码',
   BIZ_STATE VARCHAR(50) NULL    COMMENT '业务状态',
-  PARENT_ID VARCHAR(32) NOT NULL    COMMENT '父ID',
+  PARENT_ID VARCHAR(32) NULL    COMMENT '父ID',
   OWNER_NAME VARCHAR(50) NULL    COMMENT '拥有者姓名',
   OWNER_ID VARCHAR(50) NULL    COMMENT '拥有者ID',
   DEPT_ID VARCHAR(50) NULL    COMMENT '部门ID',

nop-wf/deploy/sql/oracle/_create_nop-wf.sql

@@ -119,11 +119,11 @@ CREATE TABLE nop_wf_dyn_entity(
   OBJ_TYPE VARCHAR2(100) NOT NULL ,
   NAME VARCHAR2(100) NOT NULL ,
   DISPLAY_NAME VARCHAR2(500)  ,
-  SORT_ORDER INTEGER NOT NULL ,
+  SORT_ORDER INTEGER  ,
   NOP_FLOW_ID VARCHAR2(32)  ,
-  BIZ_STATUS INTEGER NOT NULL ,
+  BIZ_STATUS INTEGER  ,
   BIZ_STATE VARCHAR2(50)  ,
-  PARENT_ID VARCHAR2(32) NOT NULL ,
+  PARENT_ID VARCHAR2(32)  ,
   OWNER_NAME VARCHAR2(50)  ,
   OWNER_ID VARCHAR2(50)  ,
   DEPT_ID VARCHAR2(50)  ,

nop-wf/deploy/sql/postgresql/_create_nop-wf.sql

@@ -119,11 +119,11 @@ CREATE TABLE nop_wf_dyn_entity(
   OBJ_TYPE VARCHAR(100) NOT NULL ,
   NAME VARCHAR(100) NOT NULL ,
   DISPLAY_NAME VARCHAR(500)  ,
-  SORT_ORDER INT4 NOT NULL ,
+  SORT_ORDER INT4  ,
   NOP_FLOW_ID VARCHAR(32)  ,
-  BIZ_STATUS INT4 NOT NULL ,
+  BIZ_STATUS INT4  ,
   BIZ_STATE VARCHAR(50)  ,
-  PARENT_ID VARCHAR(32) NOT NULL ,
+  PARENT_ID VARCHAR(32)  ,
   OWNER_NAME VARCHAR(50)  ,
   OWNER_ID VARCHAR(50)  ,
   DEPT_ID VARCHAR(50)  ,

nop-wf/nop-wf-core/src/main/java/io/nop/wf/core/IWorkflowStep.java

@@ -72,15 +72,15 @@ default int getStepStatus() {
     }
 
     default boolean isHistory() {
-        return getStepStatus() >= NopWfCoreConstants.WF_STEP_STATUS_HISTORY_BOUND;
+        return getRecord().isHistory();
     }
 
     default boolean isWaiting() {
-        return getStepStatus() == NopWfCoreConstants.WF_STEP_STATUS_WAITING;
+        return getRecord().isWaiting();
     }
 
     default boolean isActivated() {
-        return getStepStatus() == NopWfCoreConstants.WF_STEP_STATUS_ACTIVATED;
+        return getRecord().isActivated();
     }
 
     default boolean isSuspended() {
@@ -137,7 +137,23 @@ default boolean isFlowType() {
 
     void kill(Map<String, Object> args, IServiceContext ctx);
 
-    void triggerTransition(Map<String, Object> args, IServiceContext ctx);
+    /**
+     * 对于状态处于activated的步骤，触发transition迁移
+     *
+     * @param args 输入参数
+     * @param ctx  执行上下文
+     * @return 返回true表示发生了迁移
+     */
+    boolean triggerTransition(Map<String, Object> args, IServiceContext ctx);
+
+    /**
+     * 检查步骤状态是否可以从waiting转换为activated
+     *
+     * @param args 输入参数
+     * @param ctx  执行上下文
+     * @return 返回true表示状态发生了变化
+     */
+    boolean triggerWaiting(Map<String, Object> args, IServiceContext ctx);
 
     void notifySubFlowEnd(int status, Map<String, Object> results, IServiceContext ctx);
 

nop-wf/nop-wf-core/src/main/java/io/nop/wf/core/engine/IWorkflowEngine.java

@@ -64,6 +64,8 @@ public interface IWorkflowEngine {
 
     boolean triggerTransition(IWorkflowStepImplementor step, Map<String, Object> args, IServiceContext ctx);
 
+    boolean triggerWaiting(IWorkflowStepImplementor step, Map<String, Object> args, IServiceContext ctx);
+
     void notifySubFlowEnd(IWorkflowStepImplementor step, int status, Map<String, Object> args, IServiceContext ctx);
 
     boolean isAllowCall(IWorkflowStepImplementor step, IServiceContext ctx);

nop-wf/nop-wf-core/src/main/java/io/nop/wf/core/engine/WorkflowEngineImpl.java

@@ -227,10 +227,16 @@ private Map<String, Object> removeStdStartParam(Map<String, Object> args, IWorkf
         wfRecord.setBizObjName(bizObjName);
 
         String bizEntityId = (String) args.remove(NopWfCoreConstants.PARAM_BIZ_OBJ_ID);
-        wfRecord.setBizObjId(bizEntityId);
+        if (!StringHelper.isEmpty(bizEntityId)) {
+            //VarCollector.instance().collectVar("NopWfInstance@bizEntityId",bizEntityId);
+            wfRecord.setBizObjId(bizEntityId);
+        }
 
         String bizKey = (String) args.remove(NopWfCoreConstants.PARAM_BIZ_KEY);
-        wfRecord.setBizKey(bizKey);
+        if (!StringHelper.isEmpty(bizKey)) {
+            //VarCollector.instance().collectVar("NopWfInstance@bizKey",bizKey);
+            wfRecord.setBizKey(bizKey);
+        }
         return args;
     }
 
@@ -359,6 +365,11 @@ protected IWorkflowStepImplementor newStepForActor(String stepGroup, Double exec
             wf.getStore().addNextStepRecord(currentStep.getRecord(), fromAction, step.getRecord());
         }
 
+        // 处于等待状态的join步骤，新增加上游步骤之后需要检查是否可以转入激活状态
+        if (stepModel.getJoinType() != null && step.isWaiting()) {
+            wfRt.delayExecute(() -> checkWaitingJoinStep(step, wfRt));
+        }
+
         return step;
     }
 
@@ -762,8 +773,8 @@ private boolean runStepAutoTransition(IWorkflowStepImplementor step, WfRuntime w
                 Set<String> onStates = stepModel.getTransition().getOnAppStates();
                 if (onStates != null && !onStates.isEmpty()) {
                     if (!onStates.contains(step.getRecord().getAppState())) {
-                        LOG.info("nop.wf.step-not-allow-transition-when-state-not-ready:state={},onStates={}",
-                                step.getRecord().getAppState(), onStates);
+                        LOG.info("nop.wf.step-not-allow-transition-when-state-not-ready:stepName={},state={},onStates={},wfName={},wfId={}",
+                                step.getModel().getName(), step.getRecord().getAppState(), onStates, wfRt.getWf().getWfName(), wfRt.getWf().getWfId());
                         return false;
                     }
                 }
@@ -878,10 +889,16 @@ void _killStep(IWorkflowStepImplementor step, WfRuntime wfRt) {
     public boolean triggerTransition(IWorkflowStepImplementor step, Map<String, Object> args, IServiceContext ctx) {
         WfRuntime wfRt = newWfRuntime(step, ctx);
         initArgs(wfRt, args);
-        checkWaitingStep(step, wfRt);
         return runStepAutoTransition(step, wfRt);
     }
 
+    @Override
+    public boolean triggerWaiting(IWorkflowStepImplementor step, Map<String, Object> args, IServiceContext ctx) {
+        WfRuntime wfRt = newWfRuntime(step, ctx);
+        initArgs(wfRt, args);
+        return checkWaitingStep(step, wfRt);
+    }
+
     @Override
     public void notifySubFlowEnd(IWorkflowStepImplementor step, int status, Map<String, Object> results,
                                  IServiceContext ctx) {

nop-wf/nop-wf-core/src/main/java/io/nop/wf/core/impl/WorkflowStepImpl.java

@@ -176,10 +176,16 @@ public void kill(Map<String, Object> args, IServiceContext ctx) {
     }
 
     @Override
-    public void triggerTransition(Map<String, Object> args, IServiceContext ctx) {
-        wf.executeNow(() -> {
-            wf.getEngine().triggerTransition(this, args, ctx);
-            return null;
+    public boolean triggerTransition(Map<String, Object> args, IServiceContext ctx) {
+        return wf.executeNow(() -> {
+            return wf.getEngine().triggerTransition(this, args, ctx);
+        });
+    }
+
+    @Override
+    public boolean triggerWaiting(Map<String, Object> args, IServiceContext ctx) {
+        return wf.executeNow(() -> {
+            return wf.getEngine().triggerWaiting(this, args, ctx);
         });
     }
 

nop-wf/nop-wf-core/src/main/java/io/nop/wf/core/model/_gen/_WfTransitionModel.java

@@ -38,7 +38,7 @@ public abstract class _WfTransitionModel extends io.nop.core.resource.component.
     /**
      *  
      * xml name: splitType
-     * 分支类型，and表示每个分支都执行，or表示从上至下执行，只执行第一个满足条件的迁移目标。
+     * 分支类型，and表示每个分支都执行，or表示从上至下执行，只执行第一个满足条件的迁移目标。缺省为and
      */
     private io.nop.wf.core.model.WfSplitType _splitType ;
 
@@ -137,7 +137,7 @@ public void setOnAppStates(java.util.Set<java.lang.String> value){
     /**
      * 
      * xml name: splitType
-     *  分支类型，and表示每个分支都执行，or表示从上至下执行，只执行第一个满足条件的迁移目标。
+     *  分支类型，and表示每个分支都执行，or表示从上至下执行，只执行第一个满足条件的迁移目标。缺省为and
      */
 
     public io.nop.wf.core.model.WfSplitType getSplitType(){

nop-wf/nop-wf-core/src/main/resources/_vfs/nop/wf/base/oa.xwf

@@ -2,6 +2,10 @@
 <workflow x:schema="/nop/schema/wf/wf.xdef" xmlns:x="/nop/schema/xdsl.xdef"
           xmlns:oa="oa">
 
+    <x:config>
+        <c:import from="/nop/wf/xlib/oa.xlib" />
+    </x:config>
+
     <start startStepName="start">
     </start>
 

nop-wf/nop-wf-dao/src/main/resources/_vfs/nop/wf/orm/_app.orm.xml

@@ -200,11 +200,11 @@
                 <column code="DUE_TIME" displayName="完成时限" name="dueTime" propId="12" stdDataType="timestamp"
                         stdSqlType="TIMESTAMP" tagSet="clock" i18n-en:displayName="Due Time"/>
                 <column code="BIZ_KEY" displayName="业务唯一键" name="bizKey" precision="200" propId="13"
-                        stdDataType="string" stdSqlType="VARCHAR" i18n-en:displayName="BizKey"/>
+                        stdDataType="string" stdSqlType="VARCHAR" tagSet="var" i18n-en:displayName="BizKey"/>
                 <column code="BIZ_OBJ_NAME" displayName="业务对象名" name="bizObjName" precision="200" propId="14"
                         stdDataType="string" stdSqlType="VARCHAR" i18n-en:displayName="BizObjName"/>
                 <column code="BIZ_OBJ_ID" displayName="业务对象ID" name="bizObjId" precision="200" propId="15"
-                        stdDataType="string" stdSqlType="VARCHAR" i18n-en:displayName="BizObjId"/>
+                        stdDataType="string" stdSqlType="VARCHAR" tagSet="var" i18n-en:displayName="BizObjId"/>
                 <column code="PARENT_WF_NAME" displayName="父工作流名称" name="parentWfName" precision="500" propId="16"
                         stdDataType="string" stdSqlType="VARCHAR" i18n-en:displayName="Parent Flow Name"/>
                 <column code="PARENT_WF_VERSION" displayName="父流程版本" name="parentWfVersion" propId="17"
@@ -820,15 +820,15 @@
                         stdDataType="string" stdSqlType="VARCHAR" i18n-en:displayName="Name"/>
                 <column code="DISPLAY_NAME" displayName="显示名称" name="displayName" precision="500" propId="4"
                         stdDataType="string" stdSqlType="VARCHAR" i18n-en:displayName="Display Name"/>
-                <column code="SORT_ORDER" displayName="排序" mandatory="true" name="sortOrder" propId="5"
-                        stdDataType="int" stdSqlType="INTEGER" i18n-en:displayName="Sort Order"/>
+                <column code="SORT_ORDER" displayName="排序" name="sortOrder" propId="5" stdDataType="int"
+                        stdSqlType="INTEGER" i18n-en:displayName="Sort Order"/>
                 <column code="NOP_FLOW_ID" displayName="工作流实例ID" name="nopFlowId" precision="32" propId="6"
                         stdDataType="string" stdSqlType="VARCHAR" i18n-en:displayName="Workflow ID"/>
-                <column code="BIZ_STATUS" displayName="业务状态码" mandatory="true" name="bizStatus" propId="7"
-                        stdDataType="int" stdSqlType="INTEGER" i18n-en:displayName="Biz Status"/>
+                <column code="BIZ_STATUS" displayName="业务状态码" name="bizStatus" propId="7" stdDataType="int"
+                        stdSqlType="INTEGER" i18n-en:displayName="Biz Status"/>
                 <column code="BIZ_STATE" comment="业务状态是由业务自由定义" displayName="业务状态" name="bizState" precision="50"
                         propId="8" stdDataType="string" stdSqlType="VARCHAR" i18n-en:displayName="Biz State"/>
-                <column code="PARENT_ID" displayName="父ID" mandatory="true" name="parentId" precision="32" propId="9"
+                <column code="PARENT_ID" displayName="父ID" name="parentId" precision="32" propId="9"
                         stdDataType="string" stdSqlType="VARCHAR" tagSet="parent" i18n-en:displayName="Parent ID"/>
                 <column code="OWNER_NAME" displayName="拥有者姓名" name="ownerName" precision="50" propId="10"
                         stdDataType="string" stdSqlType="VARCHAR" i18n-en:displayName="Owner Name"/>

nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/input/tables/nop_auth_role.csv

@@ -0,0 +1 @@
+ROLE_ID,ROLE_NAME,CHILD_ROLE_IDS,IS_PRIMARY,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK

nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/input/tables/nop_auth_user.csv

@@ -0,0 +1 @@
+USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,REL_DEPT_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,MANAGER_ID,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,TENANT_ID,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK

nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/input/tables/nop_auth_user_role.csv

@@ -0,0 +1 @@
+USER_ID,ROLE_ID,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK

nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_auth_dept.csv

@@ -0,0 +1,3 @@
+_chgType,DEPT_ID,DEPT_NAME,PARENT_ID,ORDER_NUM,DEPT_TYPE,MANAGER_ID,EMAIL,PHONE,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
+A,@var:NopAuthDept@deptId,dept_a,@var:NopAuthDept@deptId_1,,,@var:NopAuthUser@userId_2,,,0,0,autotest-ref,*,autotest-ref,*,
+A,@var:NopAuthDept@deptId_1,dept_b,,,,@var:NopAuthUser@userId_4,,,0,0,autotest-ref,*,autotest-ref,*,

nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_auth_role.csv

@@ -0,0 +1,2 @@
+_chgType,ROLE_ID,ROLE_NAME,CHILD_ROLE_IDS,IS_PRIMARY,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
+A,manager,manager,,,0,0,autotest-ref,*,autotest-ref,*,

nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_auth_user.csv

@@ -0,0 +1,6 @@
+_chgType,USER_ID,USER_NAME,PASSWORD,SALT,NICK_NAME,DEPT_ID,OPEN_ID,REL_DEPT_ID,GENDER,AVATAR,EMAIL,EMAIL_VERIFIED,PHONE,PHONE_VERIFIED,BIRTHDAY,USER_TYPE,STATUS,ID_TYPE,ID_NBR,EXPIRE_AT,PWD_UPDATE_TIME,CHANGE_PWD_AT_LOGIN,REAL_NAME,MANAGER_ID,WORK_NO,POSITION_ID,TELEPHONE,CLIENT_ID,DEL_FLAG,VERSION,TENANT_ID,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
+A,@var:NopAuthUser@userId,user_1,@var:NopAuthUser@password,,user_1,@var:NopAuthDept@deptId,@var:NopAuthUser@openId,,1,,,,,0,,1,1,,,,,,,@var:NopAuthUser@userId_1,,,,,0,0,0,autotest-ref,*,autotest-ref,*,
+A,@var:NopAuthUser@userId_1,user_2,@var:NopAuthUser@password,,user_2,@var:NopAuthDept@deptId,@var:NopAuthUser@openId_1,,1,,,,,0,,1,1,,,,,,,@var:NopAuthUser@userId_2,,,,,0,0,0,autotest-ref,*,autotest-ref,*,
+A,@var:NopAuthUser@userId_2,user_3,@var:NopAuthUser@password,,user_3,@var:NopAuthDept@deptId,@var:NopAuthUser@openId_2,,1,,,,,0,,1,1,,,,,,,@var:NopAuthUser@userId_4,,,,,0,0,0,autotest-ref,*,autotest-ref,*,
+A,@var:NopAuthUser@userId_3,user_4,@var:NopAuthUser@password,,user_4,@var:NopAuthDept@deptId_1,@var:NopAuthUser@openId_3,,1,,,,,0,,1,1,,,,,,,,,,,,0,0,0,autotest-ref,*,autotest-ref,*,
+A,@var:NopAuthUser@userId_4,user_5,@var:NopAuthUser@password,,user_5,@var:NopAuthDept@deptId_1,@var:NopAuthUser@openId_4,,1,,,,,0,,1,1,,,,,,,,,,,,0,0,0,autotest-ref,*,autotest-ref,*,

nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_auth_user_role.csv

@@ -0,0 +1,2 @@
+_chgType,USER_ID,ROLE_ID,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
+A,@var:NopAuthUser@userId_4,manager,0,autotest-ref,*,autotest-ref,*,

nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_action.csv

@@ -0,0 +1,3 @@
+_chgType,SID,WF_ID,STEP_ID,ACTION_NAME,DISPLAY_NAME,EXEC_TIME,CALLER_ID,CALLER_NAME,OPINION,ERR_CODE,ERR_MSG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME
+A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,agree,同意,@var:NopWfAction@execTime_1,5,user_5,,,,0,autotest-ref,*,autotest-ref,*
+A,@var:NopWfAction@sid,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,agree,同意,@var:NopWfAction@execTime,2,user_2,,,,0,autotest-ref,*,autotest-ref,*

nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_dyn_entity.csv

@@ -0,0 +1,2 @@
+_chgType,SID,OBJ_TYPE,NAME,DISPLAY_NAME,SORT_ORDER,NOP_FLOW_ID,BIZ_STATUS,BIZ_STATE,PARENT_ID,OWNER_NAME,OWNER_ID,DEPT_ID,STRING_FLD1,DECIMAL_FLD1,INT_FLD1,LONG_FLD1,DATE_FLD1,TIMESTAMP_FLD1,FILE_FLD1,STRING_FLD2,DECIMAL_FLD2,INT_FLD2,LONG_FLD2,DATE_FLD2,TIMESTAMP_FLD2,FILE_FLD2,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
+A,@var:AppDynSalaryAdjustment@sid,AppDynSalaryAdjustment,abc,,,@var:NopWfInstance@wfId,,,,,,,,,,,,,,,,,,,,,0,autotest-ref,*,autotest-ref,*,

nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_dyn_entity_ext.csv

@@ -0,0 +1,4 @@
+_chgType,ENTITY_ID,FIELD_NAME,FIELD_TYPE,DECIMAL_SCALE,DECIMAL_VALUE,DATE_VALUE,TIMESTAMP_VALUE,STRING_VALUE,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
+A,@var:AppDynSalaryAdjustment@sid,employeeId,11,,,,,100,0,autotest-ref,*,autotest-ref,*,
+A,@var:AppDynSalaryAdjustment@sid,salary1,8,,30000.0,,,,0,autotest-ref,*,autotest-ref,*,
+A,@var:AppDynSalaryAdjustment@sid,salary2,8,,40000.0,,,,0,autotest-ref,*,autotest-ref,*,

nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_instance.csv

@@ -0,0 +1,2 @@
+_chgType,WF_ID,WF_NAME,WF_VERSION,WF_PARAMS,WF_GROUP,WORK_SCOPE,TITLE,STATUS,APP_STATE,START_TIME,END_TIME,DUE_TIME,BIZ_KEY,BIZ_OBJ_NAME,BIZ_OBJ_ID,PARENT_WF_NAME,PARENT_WF_VERSION,PARENT_WF_ID,PARENT_STEP_ID,STARTER_ID,STARTER_NAME,STARTER_DEPT_ID,LAST_OPERATOR_ID,LAST_OPERATOR_NAME,LAST_OPERATOR_DEPT_ID,LAST_OPERATE_TIME,MANAGER_TYPE,MANAGER_DEPT_ID,MANAGER_NAME,MANAGER_ID,PRIORITY,SIGNAL_TEXT,TAG_TEXT,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
+A,@var:NopWfInstance@wfId,beeflow/salary-adjustment,1,,default,,beeflow/salary-adjustment,40,agree,@var:NopWfInstance@startTime,@var:NopWfInstance@endTime,,,AppDynSalaryAdjustment,@var:NopWfInstance@bizObjId,,,,,1,user_1,a,5,user_5,b,@var:NopWfInstance@lastOperateTime,,,,,100,,,0,autotest-ref,*,autotest-ref,*,