diff --git a/nop-api-core/src/main/java/io/nop/api/core/ApiConfigs.java b/nop-api-core/src/main/java/io/nop/api/core/ApiConfigs.java index 18920fa4a..b671a8225 100644 --- a/nop-api-core/src/main/java/io/nop/api/core/ApiConfigs.java +++ b/nop-api-core/src/main/java/io/nop/api/core/ApiConfigs.java @@ -86,8 +86,8 @@ public interface ApiConfigs { varRef(s_loc, "nop.auth.enable-data-auth", Boolean.class, false); - @Description("时间戳类型是否返回毫秒信息") - IConfigReference CFG_CONVERT_IGNORE_MILLIS_IN_TIMESTAMP = - varRef(s_loc, "nop.convert.ignore-millis-in-timestamp", Boolean.class, true); +// @Description("时间戳类型是否返回毫秒信息") +// IConfigReference CFG_CONVERT_IGNORE_MILLIS_IN_TIMESTAMP = +// varRef(s_loc, "nop.convert.ignore-millis-in-timestamp", Boolean.class, true); } \ No newline at end of file diff --git a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestGraphQLTransaction/testRollback/output/tables/nop_auth_role.csv b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestGraphQLTransaction/testRollback/output/tables/nop_auth_role.csv index 63f51eb39..21b681810 100644 --- a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestGraphQLTransaction/testRollback/output/tables/nop_auth_role.csv +++ b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestGraphQLTransaction/testRollback/output/tables/nop_auth_role.csv @@ -1 +1,2 @@ _chgType,ROLE_ID,ROLE_NAME,CHILD_ROLE_IDS,IS_PRIMARY,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK + diff --git a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin2/output/tables/nop_auth_session.csv b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin2/output/tables/nop_auth_session.csv index 00a34adb3..8a5817533 100644 --- a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin2/output/tables/nop_auth_session.csv +++ b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin2/output/tables/nop_auth_session.csv @@ -1,3 +1,3 @@ _chgType,SESSION_ID,USER_ID,USER_NAME,TENANT_ID,LOGIN_ADDR,LOGIN_DEVICE,LOGIN_APP,LOGIN_OS,LOGIN_TIME,LOGIN_TYPE,LOGOUT_TIME,LOGOUT_TYPE,LOGOUT_BY,LAST_ACCESS_TIME,ACCESS_TOKEN,REFRESH_TOKEN,CACHE_DATA,CREATED_BY,CREATE_TIME,REMARK A,@var:NopAuthSession@sessionId,@var:NopAuthUser@userId,auto_test1,0,,,,,@var:NopAuthSession@loginTime,1,@var:NopAuthSession@logoutTime,4,autotest-ref,,,,,autotest-ref,*, -A,@var:NopAuthSession@sessionId_1,@var:NopAuthUser@userId,auto_test1,0,,,,,@var:NopAuthSession@loginTime,1,,0,,,,,,autotest-ref,*, +A,@var:NopAuthSession@sessionId_1,@var:NopAuthUser@userId,auto_test1,0,,,,,@var:NopAuthSession@loginTime_1,1,,0,,,,,,autotest-ref,*, diff --git a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestNopAuthUserBizModel/testNestedFragments/output/response.json5 b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestNopAuthUserBizModel/testNestedFragments/output/response.json5 index f86ad6750..c70b6376f 100644 --- a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestNopAuthUserBizModel/testNestedFragments/output/response.json5 +++ b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestNopAuthUserBizModel/testNestedFragments/output/response.json5 @@ -18,9 +18,9 @@ "delFlag": 0, "version": 0, "createdBy": "autotest-ref", - "createTime": "@var:NopAuthUserRole@updateTime", + "createTime": "@var:NopAuthRole@updateTime", "updatedBy": "autotest-ref", - "updateTime": "@var:NopAuthUserRole@updateTime", + "updateTime": "@var:NopAuthRole@updateTime", "remark": null } }, diff --git a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestNopAuthUserBizModel/testNestedFragments/output/response2.json5 b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestNopAuthUserBizModel/testNestedFragments/output/response2.json5 index d06cebb74..953f3bf4d 100644 --- a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestNopAuthUserBizModel/testNestedFragments/output/response2.json5 +++ b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestNopAuthUserBizModel/testNestedFragments/output/response2.json5 @@ -19,9 +19,9 @@ "delFlag": 0, "version": 0, "createdBy": "autotest-ref", - "createTime": "@var:NopAuthUserRole@updateTime", + "createTime": "@var:NopAuthRole@updateTime", "updatedBy": "autotest-ref", - "updateTime": "@var:NopAuthUserRole@updateTime", + "updateTime": "@var:NopAuthRole@updateTime", "remark": null } } diff --git a/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/AutoTestConstants.java b/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/AutoTestConstants.java index b3e87cee8..251a0e1d2 100644 --- a/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/AutoTestConstants.java +++ b/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/AutoTestConstants.java @@ -20,4 +20,6 @@ public interface AutoTestConstants { String VARIANT_DEFAULT = "_default"; char PATTERN_PREFIX = '@'; + + String CFG_GRAPHQL_IGNORE_MILLIS_IN_TIMESTAMP = "nop.graphql.ignore-millis-in-timestamp"; } diff --git a/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/data/AutoTestVars.java b/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/data/AutoTestVars.java index e3f6037fd..526a3386a 100644 --- a/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/data/AutoTestVars.java +++ b/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/data/AutoTestVars.java @@ -7,20 +7,17 @@ */ package io.nop.autotest.core.data; -import io.nop.commons.util.DateHelper; import io.nop.commons.util.StringHelper; import io.nop.core.lang.json.JsonTool; import io.nop.core.lang.json.utils.JsonTransformHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.sql.Timestamp; import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.TreeMap; -import static io.nop.api.core.ApiConfigs.CFG_CONVERT_IGNORE_MILLIS_IN_TIMESTAMP; import static io.nop.autotest.core.AutoTestConstants.PATTERN_PREFIX; import static io.nop.autotest.core.AutoTestConstants.V_VAR_PREFIX; import static io.nop.commons.util.StringHelper.leftPad; @@ -133,11 +130,6 @@ private static Object normalizeValue(Object value) { return null; if (value instanceof String) return value; - if (value instanceof Timestamp) { - if (CFG_CONVERT_IGNORE_MILLIS_IN_TIMESTAMP.get()) { - return DateHelper.formatTimestampNoMillis((Timestamp) value); - } - } return JsonTool.serializeToJson(value, false); } diff --git a/nop-autotest/nop-autotest-junit/src/main/java/io/nop/autotest/junit/NopJunitExtension.java b/nop-autotest/nop-autotest-junit/src/main/java/io/nop/autotest/junit/NopJunitExtension.java index 9743f5d25..c7240b250 100644 --- a/nop-autotest/nop-autotest-junit/src/main/java/io/nop/autotest/junit/NopJunitExtension.java +++ b/nop-autotest/nop-autotest-junit/src/main/java/io/nop/autotest/junit/NopJunitExtension.java @@ -11,7 +11,6 @@ import io.nop.api.core.annotations.autotest.NopTestProperties; import io.nop.api.core.annotations.autotest.NopTestProperty; import io.nop.api.core.config.AppConfig; -import io.nop.api.core.config.SimpleConfigProvider; import io.nop.api.core.ioc.BeanContainerStartMode; import io.nop.api.core.time.CoreMetrics; import io.nop.core.initialize.CoreInitialization; @@ -20,6 +19,7 @@ import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; +import static io.nop.autotest.core.AutoTestConstants.CFG_GRAPHQL_IGNORE_MILLIS_IN_TIMESTAMP; import static io.nop.core.unittest.BaseTestCase.setTestConfig; import static io.nop.ioc.IocConfigs.CFG_IOC_APP_BEANS_CONTAINER_START_MODE; @@ -39,6 +39,9 @@ void processTestConfig(ExtensionContext context) { // 单元测试总是采用lazy模式启动程序 setTestConfig(CFG_IOC_APP_BEANS_CONTAINER_START_MODE, BeanContainerStartMode.ALL_LAZY.name()); + // 为了更精确的匹配JSON数据，这里保留Timestamp的毫秒部分 + setTestConfig(CFG_GRAPHQL_IGNORE_MILLIS_IN_TIMESTAMP, false); + NopTestConfig config = context.getRequiredTestClass().getAnnotation(NopTestConfig.class); if (config != null) { new NopTestConfigProcessor().process(config); @@ -49,10 +52,10 @@ void processTestConfig(ExtensionContext context) { for (NopTestProperty prop : props.value()) { setTestConfig(prop.name(), prop.value()); } - }else{ + } else { NopTestProperty prop = context.getRequiredTestClass().getAnnotation(NopTestProperty.class); - if(prop != null){ - setTestConfig(prop.name(),prop.value()); + if (prop != null) { + setTestConfig(prop.name(), prop.value()); } } } diff --git a/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json b/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json index 59ab5ec86..bc6e91482 100644 --- a/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json +++ b/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json @@ -3835,6 +3835,12 @@ "java.lang.String" ] }, + { + "name": "parseTime", + "parameterTypes": [ + "java.lang.String" + ] + }, { "name": "registerFormatter", "parameterTypes": [ @@ -5213,6 +5219,13 @@ "java.lang.String" ] }, + { + "name": "mergeTagSet", + "parameterTypes": [ + "java.lang.String", + "java.lang.String" + ] + }, { "name": "methodAdd", "parameterTypes": [ @@ -13750,6 +13763,12 @@ "java.lang.String" ] }, + { + "name": "getDialectNameForQuerySpace", + "parameterTypes": [ + "java.lang.String" + ] + }, { "name": "getMainTxnGroup", "parameterTypes": [ @@ -13760,6 +13779,10 @@ "name": "getNamedQuerySpaces", "parameterTypes": [] }, + { + "name": "getQuerySpaceToDialectMap", + "parameterTypes": [] + }, { "name": "getRegisteredTransaction", "parameterTypes": [ diff --git a/nop-cli-core/src/main/resources/nop-vfs-index.txt b/nop-cli-core/src/main/resources/nop-vfs-index.txt index 8c7fd3ee8..157c137e8 100644 --- a/nop-cli-core/src/main/resources/nop-vfs-index.txt +++ b/nop-cli-core/src/main/resources/nop-vfs-index.txt @@ -52,6 +52,7 @@ /nop/core/xlib/file.xlib /nop/core/xlib/filter.xlib /nop/core/xlib/meta-gen.xlib +/nop/core/xlib/meta-prop.xlib /nop/dao/beans/dao-defaults.beans.xml /nop/dao/dialect/db2.dialect.xml /nop/dao/dialect/default.dialect.xml diff --git a/nop-config/src/main/java/io/nop/config/impl/DefaultConfigProvider.java b/nop-config/src/main/java/io/nop/config/impl/DefaultConfigProvider.java index 79248fe09..2dc4607df 100644 --- a/nop-config/src/main/java/io/nop/config/impl/DefaultConfigProvider.java +++ b/nop-config/src/main/java/io/nop/config/impl/DefaultConfigProvider.java @@ -58,7 +58,7 @@ public DefaultConfigProvider(IConfigSource configSource, IConfigValueEnhancer co super(refs, staticValues); this.configSource = configSource; this.configValueEnhancer = configValueEnhancer; - this.configRefs = (Map) refs; + this.configRefs = refs; this.configValues = configSource.getConfigValues(); } diff --git a/nop-core/src/test/java/io/nop/core/lang/json/TestJsonTool.java b/nop-core/src/test/java/io/nop/core/lang/json/TestJsonTool.java index 91c7ae14b..e3aaa2352 100644 --- a/nop-core/src/test/java/io/nop/core/lang/json/TestJsonTool.java +++ b/nop-core/src/test/java/io/nop/core/lang/json/TestJsonTool.java @@ -112,6 +112,7 @@ public void testApiRequest() { public void testTimestamp() { String str = JsonTool.stringify(new Timestamp(System.currentTimeMillis())); System.out.println(str); + assertTrue(str.length() > 19); assertEquals(3, JsonTool.serializeToJson(3)); } diff --git a/nop-file/model/nop-file.orm.xlsx b/nop-file/model/nop-file.orm.xlsx index 15201c09e..c9d885bfa 100644 Binary files a/nop-file/model/nop-file.orm.xlsx and b/nop-file/model/nop-file.orm.xlsx differ diff --git a/nop-file/nop-file-dao/src/main/resources/_vfs/nop/file/orm/_app.orm.xml b/nop-file/nop-file-dao/src/main/resources/_vfs/nop/file/orm/_app.orm.xml index d6f32f0f9..91b6c8f70 100644 --- a/nop-file/nop-file-dao/src/main/resources/_vfs/nop/file/orm/_app.orm.xml +++ b/nop-file/nop-file-dao/src/main/resources/_vfs/nop/file/orm/_app.orm.xml @@ -51,14 +51,14 @@ + stdDataType="string" stdSqlType="VARCHAR" tagSet="var" i18n-en:displayName="BizObjId"/> + tagSet="var" i18n-en:displayName="Original File ID"/> \n \n \n \n \n 1\n \n \n \n \n \n \n 2\n \n \n \n \n \n \n 3\n \n \n \n \n \n \n 4\n \n \n \n \n \n \n 5\n \n \n \n \n \n \n 6\n \n \n \n \n \n \n 7\n \n \n \n \n \n \n 8\n \n \n \n \n \n \n 9\n \n \n \n \n \n \n 10\n \n \n \n \n \n \n 11\n \n \n \n \n \n \n 12\n \n \n \n \n \n \n 13\n \n \n \n \n \n \n 14\n \n \n 'A'\n \n \n \n \n \n \n 15\n \n \n \n \n \n \n 16\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n", - "id": "@var:NopRuleDefinition@ruleId", "description": null, "remark": null }, diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/tables/nop_file_record.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/tables/nop_file_record.csv index 69abcfd71..e448e0ebb 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/tables/nop_file_record.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/tables/nop_file_record.csv @@ -1,2 +1,2 @@ -_chgType,FILE_ID,FILE_NAME,FILE_PATH,FILE_EXT,MIME_TYPE,FILE_LENGTH,FILE_LAST_MODIFIED,BIZ_OBJ_NAME,BIZ_OBJ_ID,FIELD_NAME,FILE_HASH,DEL_FLAG,CREATED_BY,CREATE_TIME,REMARK -A,@var:NopFileRecord@fileId,decision-matrix.rule.xlsx,@var:NopFileRecord@filePath,xlsx,binary,15067,,NopRuleDefinition,__TEMP__,importFile,,1,autotest-ref,*, +_chgType,FILE_ID,FILE_NAME,FILE_PATH,FILE_EXT,MIME_TYPE,FILE_LENGTH,FILE_LAST_MODIFIED,BIZ_OBJ_NAME,BIZ_OBJ_ID,FIELD_NAME,FILE_HASH,ORIGIN_FILE_ID,IS_PUBLIC,DEL_FLAG,CREATED_BY,CREATE_TIME,REMARK +A,@var:NopFileRecord@fileId,decision-matrix.rule.xlsx,@var:NopFileRecord@filePath,xlsx,binary,15067,,NopRuleDefinition,@var:NopFileRecord@bizObjId,importFile,,@var:NopFileRecord@originFileId,false,1,autotest-ref,*, diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/input/tables/nop_file_record.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/input/tables/nop_file_record.csv index 733c4e106..c6a733196 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/input/tables/nop_file_record.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/input/tables/nop_file_record.csv @@ -1 +1 @@ -FILE_ID,FILE_NAME,FILE_PATH,FILE_EXT,MIME_TYPE,FILE_LENGTH,FILE_LAST_MODIFIED,BIZ_OBJ_NAME,BIZ_OBJ_ID,FIELD_NAME,FILE_HASH,DEL_FLAG,CREATED_BY,CREATE_TIME,REMARK +FILE_ID,FILE_NAME,FILE_PATH,FILE_EXT,MIME_TYPE,FILE_LENGTH,FILE_LAST_MODIFIED,BIZ_OBJ_NAME,BIZ_OBJ_ID,FIELD_NAME,FILE_HASH,ORIGIN_FILE_ID,IS_PUBLIC,DEL_FLAG,CREATED_BY,CREATE_TIME,REMARK diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/response.json5 b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/response.json5 index d58125802..6f27ef2b1 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/response.json5 +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/response.json5 @@ -1,5 +1,6 @@ { "data": { + "id": "@var:NopRuleDefinition@ruleId", "ruleId": "@var:NopRuleDefinition@ruleId", "ruleName": "test", "ruleVersion": 1, @@ -49,7 +50,6 @@ ], "beforeExecute": null, "decisionMatrix": null, - "id": "@var:NopRuleDefinition@ruleId", "description": null, "remark": null }, diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_file_record.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_file_record.csv index e0eda1fc9..59d6650a6 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_file_record.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_file_record.csv @@ -1,2 +1,2 @@ -_chgType,FILE_ID,FILE_NAME,FILE_PATH,FILE_EXT,MIME_TYPE,FILE_LENGTH,FILE_LAST_MODIFIED,BIZ_OBJ_NAME,BIZ_OBJ_ID,FIELD_NAME,FILE_HASH,DEL_FLAG,CREATED_BY,CREATE_TIME,REMARK -A,@var:NopFileRecord@fileId,decision-tree.rule.xlsx,@var:NopFileRecord@filePath,xlsx,binary,11856,,NopRuleDefinition,__TEMP__,importFile,,1,autotest-ref,*, +_chgType,FILE_ID,FILE_NAME,FILE_PATH,FILE_EXT,MIME_TYPE,FILE_LENGTH,FILE_LAST_MODIFIED,BIZ_OBJ_NAME,BIZ_OBJ_ID,FIELD_NAME,FILE_HASH,ORIGIN_FILE_ID,IS_PUBLIC,DEL_FLAG,CREATED_BY,CREATE_TIME,REMARK +A,@var:NopFileRecord@fileId,decision-tree.rule.xlsx,@var:NopFileRecord@filePath,xlsx,binary,11856,,NopRuleDefinition,@var:NopFileRecord@bizObjId,importFile,,@var:NopFileRecord@originFileId,false,1,autotest-ref,*, diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_node.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_node.csv index 824379efb..44b61e621 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_node.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_rule_node.csv @@ -1,24 +1,24 @@ _chgType,SID,RULE_ID,LABEL,SORT_NO,PREDICATE,OUTPUTS,PARENT_ID,IS_LEAF,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK +A,@var:NopRuleNode@sid_5,@var:NopRuleDefinition@ruleId,<= 4,1,"{""$type"":""le"",""name"":""guestCount"",""value"":4}","{ + ""dish"": ""\""Dry Aged Gourmet Steak\"""" +}",@var:NopRuleNode@sid_4,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_2,@var:NopRuleDefinition@ruleId,Winter,2,"{""$type"":""eq"",""name"":""season"",""value"":""Winter""}",,,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_9,@var:NopRuleDefinition@ruleId,Summer,5,"{""$type"":""eq"",""name"":""season"",""value"":""Summer""}",,,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_10,@var:NopRuleDefinition@ruleId,-,1,"{""$type"":""alwaysTrue""}","{ - ""dish"": ""\""Light Salad and nice Steak\"""" -}",@var:NopRuleNode@sid_9,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_8,@var:NopRuleDefinition@ruleId,> 8,1,"{""$type"":""gt"",""name"":""guestCount"",""value"":8}","{ ""dish"": ""\""Stew\"""" }",@var:NopRuleNode@sid_7,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_7,@var:NopRuleDefinition@ruleId,"in [""Fall"",""Winter"",""Spring""]",4,"{""$type"":""in"",""name"":""season"",""value"":[""Fall"",""Winter"",""Spring""]}",,,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_1,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ + ""dish"": ""\""Spareribs\"""" +}",@var:NopRuleNode@sid,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_4,@var:NopRuleDefinition@ruleId,Spring,3,"{""$type"":""eq"",""name"":""season"",""value"":""Spring""}",,,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_10,@var:NopRuleDefinition@ruleId,-,1,"{""$type"":""alwaysTrue""}","{ + ""dish"": ""\""Light Salad and nice Steak\"""" +}",@var:NopRuleNode@sid_9,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid,@var:NopRuleDefinition@ruleId,Fall,1,"{""$type"":""eq"",""name"":""season"",""value"":""Fall""}",,,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_6,@var:NopRuleDefinition@ruleId,<=8 and >= 5,2,"{""$type"":""and"",""$body"":[{""$type"":""le"",""name"":""guestCount"",""value"":8},{""$type"":""ge"",""name"":""guestCount"",""value"":5}]}","{ ""dish"": ""\""Steak\"""" }",@var:NopRuleNode@sid_4,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_5,@var:NopRuleDefinition@ruleId,<= 4,1,"{""$type"":""le"",""name"":""guestCount"",""value"":4}","{ - ""dish"": ""\""Dry Aged Gourmet Steak\"""" -}",@var:NopRuleNode@sid_4,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_7,@var:NopRuleDefinition@ruleId,"in [""Fall"",""Winter"",""Spring""]",4,"{""$type"":""in"",""name"":""season"",""value"":[""Fall"",""Winter"",""Spring""]}",,,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid,@var:NopRuleDefinition@ruleId,Fall,1,"{""$type"":""eq"",""name"":""season"",""value"":""Fall""}",,,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_9,@var:NopRuleDefinition@ruleId,Summer,5,"{""$type"":""eq"",""name"":""season"",""value"":""Summer""}",,,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_3,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ ""dish"": ""\""Roastbeef\"""" }",@var:NopRuleNode@sid_2,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_4,@var:NopRuleDefinition@ruleId,Spring,3,"{""$type"":""eq"",""name"":""season"",""value"":""Spring""}",,,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_1,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ - ""dish"": ""\""Spareribs\"""" -}",@var:NopRuleNode@sid,true,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/input/tables/nop_file_record.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/input/tables/nop_file_record.csv index 733c4e106..c6a733196 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/input/tables/nop_file_record.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/input/tables/nop_file_record.csv @@ -1 +1 @@ -FILE_ID,FILE_NAME,FILE_PATH,FILE_EXT,MIME_TYPE,FILE_LENGTH,FILE_LAST_MODIFIED,BIZ_OBJ_NAME,BIZ_OBJ_ID,FIELD_NAME,FILE_HASH,DEL_FLAG,CREATED_BY,CREATE_TIME,REMARK +FILE_ID,FILE_NAME,FILE_PATH,FILE_EXT,MIME_TYPE,FILE_LENGTH,FILE_LAST_MODIFIED,BIZ_OBJ_NAME,BIZ_OBJ_ID,FIELD_NAME,FILE_HASH,ORIGIN_FILE_ID,IS_PUBLIC,DEL_FLAG,CREATED_BY,CREATE_TIME,REMARK diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_file_record.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_file_record.csv index 2aa30640e..580530dda 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_file_record.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_file_record.csv @@ -1,3 +1,3 @@ -_chgType,FILE_ID,FILE_NAME,FILE_PATH,FILE_EXT,MIME_TYPE,FILE_LENGTH,FILE_LAST_MODIFIED,BIZ_OBJ_NAME,BIZ_OBJ_ID,FIELD_NAME,FILE_HASH,DEL_FLAG,CREATED_BY,CREATE_TIME,REMARK -A,@var:NopFileRecord@fileId,decision-tree.rule.xlsx,@var:NopFileRecord@filePath,xlsx,binary,11856,,NopRuleDefinition,__TEMP__,importFile,,1,autotest-ref,*, -A,@var:NopFileRecord@fileId_1,decision-tree.rule.xlsx,@var:NopFileRecord@filePath_1,xlsx,binary,11856,,NopRuleDefinition,__TEMP__,importFile,,1,autotest-ref,*, +_chgType,FILE_ID,FILE_NAME,FILE_PATH,FILE_EXT,MIME_TYPE,FILE_LENGTH,FILE_LAST_MODIFIED,BIZ_OBJ_NAME,BIZ_OBJ_ID,FIELD_NAME,FILE_HASH,ORIGIN_FILE_ID,IS_PUBLIC,DEL_FLAG,CREATED_BY,CREATE_TIME,REMARK +A,@var:NopFileRecord@fileId,decision-tree.rule.xlsx,@var:NopFileRecord@filePath,xlsx,binary,11856,,NopRuleDefinition,@var:NopFileRecord@bizObjId_1,importFile,,@var:NopFileRecord@originFileId,false,1,autotest-ref,*, +A,@var:NopFileRecord@fileId_1,decision-tree.rule.xlsx,@var:NopFileRecord@filePath_1,xlsx,binary,11856,,NopRuleDefinition,@var:NopFileRecord@bizObjId_1,importFile,,@var:NopFileRecord@originFileId_1,false,1,autotest-ref,*, diff --git a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_node.csv b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_node.csv index f1e65ea53..f632faacd 100644 --- a/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_node.csv +++ b/nop-rule/nop-rule-service/cases/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_rule_node.csv @@ -2,23 +2,23 @@ _chgType,SID,RULE_ID,LABEL,SORT_NO,PREDICATE,OUTPUTS,PARENT_ID,IS_LEAF,VERSION,C A,@var:NopRuleNode@sid_6,@var:NopRuleDefinition@ruleId,<=8 and >= 5,2,"{""$type"":""and"",""$body"":[{""$type"":""le"",""name"":""guestCount"",""value"":8},{""$type"":""ge"",""name"":""guestCount"",""value"":5}]}","{ ""dish"": ""\""Steak\"""" }",@var:NopRuleNode@sid_4,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_1,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ - ""dish"": ""\""Spareribs\"""" -}",@var:NopRuleNode@sid,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_3,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ ""dish"": ""\""Roastbeef\"""" }",@var:NopRuleNode@sid_2,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_4,@var:NopRuleDefinition@ruleId,Spring,3,"{""$type"":""eq"",""name"":""season"",""value"":""Spring""}",,,false,1,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_2,@var:NopRuleDefinition@ruleId,Winter,2,"{""$type"":""eq"",""name"":""season"",""value"":""Winter""}",,,false,1,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_7,@var:NopRuleDefinition@ruleId,"in [""Fall"",""Winter"",""Spring""]",4,"{""$type"":""in"",""name"":""season"",""value"":[""Fall"",""Winter"",""Spring""]}",,,false,1,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_5,@var:NopRuleDefinition@ruleId,<= 4,1,"{""$type"":""le"",""name"":""guestCount"",""value"":4}","{ ""dish"": ""\""Dry Aged Gourmet Steak\"""" }",@var:NopRuleNode@sid_4,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_10,@var:NopRuleDefinition@ruleId,-,1,"{""$type"":""alwaysTrue""}","{ - ""dish"": ""\""Light Salad and nice Steak\"""" -}",@var:NopRuleNode@sid_9,true,0,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_7,@var:NopRuleDefinition@ruleId,"in [""Fall"",""Winter"",""Spring""]",4,"{""$type"":""in"",""name"":""season"",""value"":[""Fall"",""Winter"",""Spring""]}",,,false,1,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_9,@var:NopRuleDefinition@ruleId,Summer,5,"{""$type"":""eq"",""name"":""season"",""value"":""Summer""}",,,false,1,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_4,@var:NopRuleDefinition@ruleId,Spring,3,"{""$type"":""eq"",""name"":""season"",""value"":""Spring""}",,,false,1,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid_8,@var:NopRuleDefinition@ruleId,> 8,1,"{""$type"":""gt"",""name"":""guestCount"",""value"":8}","{ ""dish"": ""\""Stew\"""" }",@var:NopRuleNode@sid_7,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_1,@var:NopRuleDefinition@ruleId,<= 8,1,"{""$type"":""le"",""name"":""guestCount"",""value"":8}","{ + ""dish"": ""\""Spareribs\"""" +}",@var:NopRuleNode@sid,true,0,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_2,@var:NopRuleDefinition@ruleId,Winter,2,"{""$type"":""eq"",""name"":""season"",""value"":""Winter""}",,,false,1,autotest-ref,*,autotest-ref,*, +A,@var:NopRuleNode@sid_10,@var:NopRuleDefinition@ruleId,-,1,"{""$type"":""alwaysTrue""}","{ + ""dish"": ""\""Light Salad and nice Steak\"""" +}",@var:NopRuleNode@sid_9,true,0,autotest-ref,*,autotest-ref,*, A,@var:NopRuleNode@sid,@var:NopRuleDefinition@ruleId,Fall,1,"{""$type"":""eq"",""name"":""season"",""value"":""Fall""}",,,false,1,autotest-ref,*,autotest-ref,*, -A,@var:NopRuleNode@sid_9,@var:NopRuleDefinition@ruleId,Summer,5,"{""$type"":""eq"",""name"":""season"",""value"":""Summer""}",,,false,1,autotest-ref,*,autotest-ref,*, diff --git a/nop-rule/nop-rule-service/src/test/java/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel.java b/nop-rule/nop-rule-service/src/test/java/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel.java index aa821eb20..c2e5febc5 100644 --- a/nop-rule/nop-rule-service/src/test/java/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel.java +++ b/nop-rule/nop-rule-service/src/test/java/io/nop/rule/service/entity/TestNopRuleDefinitionBizModel.java @@ -27,7 +27,7 @@ import java.io.InputStream; import java.util.Map; -@NopTestConfig(localDb = true, initDatabaseSchema = true,disableSnapshot = false) +@NopTestConfig(localDb = true, initDatabaseSchema = true, disableSnapshot = false) @NopTestProperty(name = "nop.file.store-dir", value = "./target") @NopTestProperty(name = "nop.orm.dao-resource-check-interval", value = "0") public class TestNopRuleDefinitionBizModel extends JunitAutoTestCase { diff --git a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/response.json5 b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/response.json5 index 210462504..42c2da080 100644 --- a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/response.json5 +++ b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/response.json5 @@ -1,5 +1,6 @@ { "data": { + "id": "@var:NopSysNoticeTemplate@sid", "sid": "@var:NopSysNoticeTemplate@sid", "name": "123", "tplType": "1", @@ -11,7 +12,6 @@ "updatedBy": "autotest-ref", "updateTime": "@var:NopSysNoticeTemplate@updateTime", "remark": "sss", - "id": "@var:NopSysNoticeTemplate@sid", "extCode": "D2024123001", "extFldA": "x" }, diff --git a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/response.json5 b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/response.json5 index f57b84891..206e388f3 100644 --- a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/response.json5 +++ b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/response.json5 @@ -8,9 +8,9 @@ "delFlag": 0, "version": 0, "createdBy": "autotest-ref", - "createTime": "@var:NopSysExtField@updateTime", + "createTime": "@var:NopSysCodeRule@updateTime", "updatedBy": "autotest-ref", - "updateTime": "@var:NopSysExtField@updateTime", + "updateTime": "@var:NopSysCodeRule@updateTime", "seqName": null, "remark": null, "extFldC": "xyz" diff --git a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/tables/nop_sys_ext_field.csv b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/tables/nop_sys_ext_field.csv index 3c55fc474..f1c6072a9 100644 --- a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/tables/nop_sys_ext_field.csv +++ b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/tables/nop_sys_ext_field.csv @@ -1,2 +1,2 @@ _chgType,ENTITY_NAME,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,io.nop.sys.dao.entity.NopSysCodeRule,@var:NopSysExtField@entityId,fldA,11,,,,,xyz,0,autotest-ref,*,autotest-ref,*, +A,io.nop.sys.dao.entity.NopSysCodeRule,@var:NopSysCodeRule@sid,fldA,11,,,,,xyz,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_action.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_action.csv index e661c91a2..55dcfa15d 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_action.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_action.csv @@ -1,5 +1,5 @@ _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_2,agree,同意,@var:NopWfAction@execTime,3,user_3,,,,0,autotest-ref,*,autotest-ref,* A,@var:NopWfAction@sid_3,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_4,agree,同意,@var:NopWfAction@execTime_3,5,user_5,,,,0,autotest-ref,*,autotest-ref,* -A,@var:NopWfAction@sid_2,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,confirm,已阅,@var:NopWfAction@execTime,4,user_4,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_2,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,confirm,已阅,@var:NopWfAction@execTime_2,4,user_4,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,agree,同意,@var:NopWfAction@execTime_1,3,user_3,,,,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,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_status_history.csv index c014b080b..eb91a1e87 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME -A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,agree,@var:NopWfStatusHistory@changeTime_1,5,user_5,b,0,autotest-ref,* A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,a,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,agree,@var:NopWfStatusHistory@changeTime_1,5,user_5,b,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_step_instance.csv index 4fca29820..49ce825e4 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_step_instance.csv @@ -1,6 +1,6 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,start,发起人,40,,,,,,,m1,user,1,a,user_1,1,user_1,,,,,,,,_start_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,approve2,审批人2,40,agree,,,,,,m1,user,3,a,user_3,3,user_3,,,,3,user_3,,,_transit_,agree,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,approve2,审批人2,40,agree,,,,,,m1,user,3,a,user_3,3,user_3,,,,3,user_3,,,_transit_,agree,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_4,@var:NopWfInstance@wfId,step,approve3,审批人3,40,agree,,,,,,m1,role,manager,,manager,,,,,,5,user_5,,,_transit_,agree,,@var:NopWfStepInstance@finishTime_4,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_4,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,step,cc1,抄送人,40,confirm,,,,,,m1,user,4,b,user_4,4,user_4,,,,4,user_4,,,_transit_,confirm,,@var:NopWfStepInstance@finishTime_3,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,approve1,审批人1,40,agree,,,,,,m1,user,2,a,user_2,2,user_2,,,,2,user_2,,,_transit_,agree,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_4,@var:NopWfInstance@wfId,step,approve3,审批人3,40,agree,,,,,,m1,role,manager,,manager,,,,,,5,user_5,,,_transit_,agree,,@var:NopWfStepInstance@finishTime_3,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_4,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,approve1,审批人1,40,agree,,,,,,m1,user,2,a,user_2,2,user_2,,,,2,user_2,,,_transit_,agree,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_step_instance_link.csv index 0de9728be..73131350c 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testPaymentApplication/output/tables/nop_wf_step_instance_link.csv @@ -1,6 +1,6 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@var:NopWfStepInstance@stepId_3,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_4,@end,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,@var:NopWfStepInstance@stepId_4,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@var:NopWfStepInstance@stepId_2,_transit_,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_4,@end,_transit_,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_action.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_action.csv index 176918c2f..dcdbcc4fb 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_action.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_action.csv @@ -1,3 +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,* -A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,agree,同意,@var:NopWfAction@execTime,5,user_5,,,,0,autotest-ref,*,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_status_history.csv index eb91a1e87..c014b080b 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,a,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,agree,@var:NopWfStatusHistory@changeTime_1,5,user_5,b,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,a,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_step_instance.csv index dca501fdb..0d29c8c20 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_step_instance.csv @@ -1,5 +1,5 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,join,approve-join,合并,40,,,,,,,,user,0,,SYS,0,SYS,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,approve1,审批人1,40,agree,,,,,,m1,user,2,a,user_2,2,user_2,,,,2,user_2,,,_transit_,agree,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,step,approve22,审批人22,40,agree,,,,,,m1,role,manager,,manager,,,,,,5,user_5,,,_transit_,agree,,@var:NopWfStepInstance@finishTime_3,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,approve1,审批人1,40,agree,,,,,,m1,user,2,a,user_2,2,user_2,,,,2,user_2,,,_transit_,agree,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,join,approve-join,合并,40,,,,,,,,user,0,,SYS,0,SYS,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,start,发起人,40,,,,,,,m1,user,1,a,user_1,1,user_1,,,,,,,,_start_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,step,approve22,审批人22,40,agree,,,,,,m1,role,manager,,manager,,,,,,5,user_5,,,_transit_,agree,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_step_instance_link.csv index d71469cd9..5c1b2b1fa 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestBeeflowCase/testSalaryAdjustment/output/tables/nop_wf_step_instance_link.csv @@ -1,5 +1,5 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@var:NopWfStepInstance@stepId_3,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,@end,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@var:NopWfStepInstance@stepId_2,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@var:NopWfStepInstance@stepId_3,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,_transit_,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,@end,_transit_,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testActor/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testActor/output/tables/nop_wf_status_history.csv index ba340edc8..6f8f025e2 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testActor/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testActor/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_status_history.csv index ba340edc8..6f8f025e2 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_step_instance.csv index 640a9caf6..15450fff5 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_step_instance.csv @@ -1,3 +1,3 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,wf-end,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,action0,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,wf-end,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_step_instance_link.csv index 7735eeba8..3b8df96db 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testBasicWorkflowState/output/tables/nop_wf_step_instance_link.csv @@ -1,3 +1,3 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,action0,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@end,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,action0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_action.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_action.csv index 8545d7977..c08fb6d80 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_action.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_action.csv @@ -1,4 +1,4 @@ _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_2,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,sp,审批,@var:NopWfAction@execTime_2,2,user_2,,,,0,autotest-ref,*,autotest-ref,* A,@var:NopWfAction@sid,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,sh,审核,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* -A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,sp,审批,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* -A,@var:NopWfAction@sid_2,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,sp,审批,@var:NopWfAction@execTime,2,user_2,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,sp,审批,@var:NopWfAction@execTime_1,1,user_1,,,,0,autotest-ref,*,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_status_history.csv index 39ace5abe..5088d8fca 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,2,user_2,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_step_instance.csv index a8c57eec4..0d1ea9352 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_step_instance.csv @@ -1,5 +1,5 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,join,会签步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,sp,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,join,会签步骤,40,,,,,,,actor2,user,2,,user_2,2,user_2,,,,2,user_2,,,sh,sp,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,1.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,join,join_join_,join_join_,40,,,,,,,,user,0,,SYS,0,SYS,,,,,,,,sp,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,join,会签步骤,40,,,,,,,actor2,user,2,,user_2,2,user_2,,,,2,user_2,,,sh,sp,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,1.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,join,会签步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,sp,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,join,join_join_,join_join_,40,,,,,,,,user,0,,SYS,0,SYS,,,,,,,,sp,,,@var:NopWfStepInstance@finishTime_3,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_step_instance_link.csv index 7da64c4db..1bd077e4f 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign/output/tables/nop_wf_step_instance_link.csv @@ -1,6 +1,6 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@var:NopWfStepInstance@stepId_3,sp,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@var:NopWfStepInstance@stepId_3,sp,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,@end,_transit_,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,sh,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@var:NopWfStepInstance@stepId_3,sp,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,sh,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,sh,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,@end,_transit_,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_action.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_action.csv index a3002e975..56e9cc7f9 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_action.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_action.csv @@ -1,4 +1,4 @@ _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_1,sp,审批,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* -A,@var:NopWfAction@sid_2,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,sp,审批,@var:NopWfAction@execTime,2,user_2,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,sp,审批,@var:NopWfAction@execTime_1,1,user_1,,,,0,autotest-ref,*,autotest-ref,* A,@var:NopWfAction@sid,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,sh,审核,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_2,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,sp,审批,@var:NopWfAction@execTime_2,2,user_2,,,,0,autotest-ref,*,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_status_history.csv index b267faea1..5088d8fca 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,2,user_2,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_step_instance.csv index 578ceb48f..4444a0959 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_step_instance.csv @@ -1,6 +1,6 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,join,会签步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,sp,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,join,join_join_,join_join_,40,,,,,,,,user,0,,SYS,0,SYS,,,,,,,,sp,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_4,@var:NopWfInstance@wfId,step,ysp,已审批,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime_4,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_4,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,join,会签步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,sp,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,join,join_join_,join_join_,40,,,,,,,,user,0,,SYS,0,SYS,,,,,,,,sp,,,@var:NopWfStepInstance@finishTime_3,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,join,会签步骤,40,,,,,,,actor2,user,2,,user_2,2,user_2,,,,2,user_2,,,sh,sp,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,1.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,join,会签步骤,40,,,,,,,actor2,user,2,,user_2,2,user_2,,,,2,user_2,,,sh,sp,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,1.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_4,@var:NopWfInstance@wfId,step,ysp,已审批,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_4,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_step_instance_link.csv index cd2c00cac..e3e266eb9 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCosign1/output/tables/nop_wf_step_instance_link.csv @@ -1,7 +1,7 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_4,@end,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@var:NopWfStepInstance@stepId_3,sp,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,@var:NopWfStepInstance@stepId_4,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@var:NopWfStepInstance@stepId_3,sp,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,sh,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,sh,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@var:NopWfStepInstance@stepId_3,sp,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_4,@end,_transit_,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCurrentStep/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCurrentStep/output/tables/nop_wf_status_history.csv index ba340edc8..c7edac4ec 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCurrentStep/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCurrentStep/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCurrentStep/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCurrentStep/output/tables/nop_wf_step_instance.csv index 3104d27a8..15450fff5 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCurrentStep/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testCurrentStep/output/tables/nop_wf_step_instance.csv @@ -1,3 +1,3 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,wf-end,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,wf-end,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,action0,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_status_history.csv index ba340edc8..c7edac4ec 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_step_instance.csv index 414bd25df..12dc63feb 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_step_instance.csv @@ -1,3 +1,3 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,wf-end,结束步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,sh,,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,wf-end,结束步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,sh,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_step_instance_link.csv index b3f0d8d20..49a1266de 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testDynamicActor/output/tables/nop_wf_step_instance_link.csv @@ -1,3 +1,3 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,sh,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@end,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,sh,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_action.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_action.csv index 3dc9d4ed2..840f47089 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_action.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_action.csv @@ -1,3 +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,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,cy,传阅,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* -A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,sh,审核,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,sh,审核,@var:NopWfAction@execTime_1,1,user_1,,,,0,autotest-ref,*,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_status_history.csv index ba340edc8..6f8f025e2 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_step_instance.csv index eb866f334..1239bd74b 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_step_instance.csv @@ -1,5 +1,5 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,mainStart,主流程开始,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_transit_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,mainStart,主流程开始,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_transit_,sh,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,step,ysh,已审核,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,sh,,,@var:NopWfStepInstance@finishTime_3,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,cyStart,开始传阅,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_transit_,cy,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,start,开始,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,_start_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,step,ysh,已审核,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,sh,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,cyStart,开始传阅,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_transit_,cy,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_step_instance_link.csv index 2918b2c4d..0d16b7243 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testEmptyStep/output/tables/nop_wf_step_instance_link.csv @@ -1,6 +1,6 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@var:NopWfStepInstance@stepId_3,sh,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,_transit_,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,@end,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@empty,cy,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,_transit_,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_instance.csv index 6026401c3..cc28c2a08 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_instance.csv @@ -1,3 +1,3 @@ _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_1,test/subflow,1,,default,,test/subflow,40,,@var:NopWfInstance@startTime_1,@var:NopWfInstance@endTime_1,,,,,test/flow,1,@var:NopWfInstance@wfId,@var:NopWfInstance@parentStepId,1,user_1,,1,user_1,,@var:NopWfInstance@lastOperateTime,,,,,100,,,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfInstance@wfId,test/flow,1,,default,,test/flow,40,,@var:NopWfInstance@startTime_1,@var:NopWfInstance@endTime_1,,,,,,,,,1,user_1,,1,user_1,,@var:NopWfInstance@lastOperateTime,,,,,100,,,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfInstance@wfId,test/flow,1,,default,,test/flow,40,,@var:NopWfInstance@startTime,@var:NopWfInstance@endTime,,,,,,,,,1,user_1,,1,user_1,,@var:NopWfInstance@lastOperateTime,,,,,100,,,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfInstance@wfId_1,test/subflow,1,,default,,test/subflow,40,,@var:NopWfInstance@startTime_1,@var:NopWfInstance@endTime_1,,,,,test/flow,1,@var:NopWfInstance@wfId,@var:NopWfInstance@parentStepId,1,user_1,,1,user_1,,@var:NopWfInstance@lastOperateTime_1,,,,,100,,,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_status_history.csv index 6c97a3ad9..795dcc1e2 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_status_history.csv @@ -1,5 +1,5 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME -A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_2,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid_3,@var:NopWfInstance@wfId_1,30,40,,@var:NopWfStatusHistory@changeTime_2,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid_3,@var:NopWfInstance@wfId_1,30,40,,@var:NopWfStatusHistory@changeTime_3,1,user_1,,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_2,@var:NopWfInstance@wfId_1,0,30,,@var:NopWfStatusHistory@changeTime_2,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_2,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_step_instance.csv index 8ee700145..b80543b33 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_step_instance.csv @@ -1,5 +1,5 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK +A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId_1,step,wf-end,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime_3,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,_start_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId_1,step,wf-end,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId_1,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,action0,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,flow,subFlow,subFlow,40,,@var:NopWfInstance@wfId_1,test/subflow,1,40,,,user,0,,SYS,0,SYS,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId_1,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,action0,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,flow,subFlow,subFlow,40,,@var:NopWfInstance@wfId_1,test/subflow,1,40,,,user,0,,SYS,0,SYS,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_step_instance_link.csv index 9fc81817a..842de591b 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testFlow/output/tables/nop_wf_step_instance_link.csv @@ -1,5 +1,5 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId_1,@var:NopWfStepInstance@stepId_3,@end,_transit_,autotest-ref,* -A,@var:NopWfInstance@wfId_1,@var:NopWfStepInstance@stepId_1,@var:NopWfStepInstance@stepId_3,action0,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@end,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId_1,@var:NopWfStepInstance@stepId_3,@end,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId_1,@var:NopWfStepInstance@stepId_1,@var:NopWfStepInstance@stepId_3,action0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_action.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_action.csv index a6b1cb5ca..73767a5c9 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_action.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_action.csv @@ -1,4 +1,4 @@ _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,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,sh,审核,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* -A,@var:NopWfAction@sid_2,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,sp2,审批2,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* -A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,sp1,审批1,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_2,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,sp2,审批2,@var:NopWfAction@execTime_2,1,user_1,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,sp1,审批1,@var:NopWfAction@execTime_1,1,user_1,,,,0,autotest-ref,*,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_status_history.csv index ba340edc8..6f8f025e2 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_step_instance.csv index ad7f3697d..0cedad2ab 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_step_instance.csv @@ -1,5 +1,5 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,ysh1,已审核,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,sp1,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,ysh1,已审核,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,sp1,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,ysh2,已审核2,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,sp2,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,启动,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,join,join,合并步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,sp1,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,ysh2,已审核2,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,sp2,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,join,join,合并步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,sp1,,,@var:NopWfStepInstance@finishTime_3,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_step_instance_link.csv index 51613e673..8ea931fdc 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testJoin/output/tables/nop_wf_step_instance_link.csv @@ -1,6 +1,6 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@var:NopWfStepInstance@stepId_3,sp1,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@var:NopWfStepInstance@stepId_3,sp2,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,sh,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,sh,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,@end,_transit_,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@var:NopWfStepInstance@stepId_3,sp2,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_status_history.csv index ba340edc8..c7edac4ec 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_step_instance.csv index 00406ee6a..3d5e6312c 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_step_instance.csv @@ -1,5 +1,5 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,cyStart,传阅start,70,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,mainStart,主启动流程,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_transit_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,mainStart,主启动流程,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_transit_,sh,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,start,启动,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,_start_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,step,ysh,已审核,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,sh,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,step,ysh,已审核,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,sh,,,@var:NopWfStepInstance@finishTime_3,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,cyStart,传阅start,70,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_step_instance_link.csv index b8a399d0b..bf780a03d 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testLoop/output/tables/nop_wf_step_instance_link.csv @@ -1,5 +1,5 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@var:NopWfStepInstance@stepId_3,sh,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,@end,_transit_,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_status_history.csv index ba340edc8..6f8f025e2 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_step_instance.csv index d9da7c8e4..c1583f352 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_step_instance.csv @@ -1,4 +1,4 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,step2,step2,70,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,step1,step1,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,step1,step1,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,_start_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,step2,step2,70,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_step_instance_link.csv index 83e55e7a8..77b335943 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testMultiTransition/output/tables/nop_wf_step_instance_link.csv @@ -1,4 +1,4 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@end,_transit_,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,_transit_,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testNoAction/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testNoAction/output/tables/nop_wf_status_history.csv index 7688542f6..c7edac4ec 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testNoAction/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testNoAction/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testNoAction/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testNoAction/output/tables/nop_wf_step_instance.csv index 11f0da429..eb7499bb9 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testNoAction/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testNoAction/output/tables/nop_wf_step_instance.csv @@ -1,3 +1,3 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,_start_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,end,end,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,end,end,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,_transit_,,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testReject/output/tables/nop_wf_action.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testReject/output/tables/nop_wf_action.csv index 2f1134d03..4defd2d51 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testReject/output/tables/nop_wf_action.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testReject/output/tables/nop_wf_action.csv @@ -1,3 +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_1,_rejectAction,退回上一步,@var:NopWfAction@execTime,2,user_2,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,_rejectAction,退回上一步,@var:NopWfAction@execTime_1,2,user_2,,,,0,autotest-ref,*,autotest-ref,* A,@var:NopWfAction@sid,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,sh,审核,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testReject/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testReject/output/tables/nop_wf_step_instance.csv index 336f9a1b9..47708f15a 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testReject/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testReject/output/tables/nop_wf_step_instance.csv @@ -1,4 +1,4 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,ysh,已审核,80,,,,,,,actor1,user,2,,user_2,2,user_2,,,,2,user_2,,,sh,_rejectAction,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,ysh,已审核,80,,,,,,,actor1,user,2,,user_2,2,user_2,,,,2,user_2,,,sh,_rejectAction,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,wf-start,开始步骤,30,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,_rejectAction,,,,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_action.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_action.csv index 1b3ff24ca..c08fb6d80 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_action.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_action.csv @@ -1,4 +1,4 @@ _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_1,sp,审批,@var:NopWfAction@execTime_2,1,user_1,,,,0,autotest-ref,*,autotest-ref,* -A,@var:NopWfAction@sid,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,sh,审核,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* A,@var:NopWfAction@sid_2,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,sp,审批,@var:NopWfAction@execTime_2,2,user_2,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,sh,审核,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,sp,审批,@var:NopWfAction@execTime_1,1,user_1,,,,0,autotest-ref,*,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_step_instance.csv index 6d6a275e8..9e2727113 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_step_instance.csv @@ -1,5 +1,5 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,启动,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,ysh,已审核,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,sp,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,ysh,已审核,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,sp,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,ysh,已审核,40,,,,,,,actor2,user,2,,user_2,2,user_2,,,,2,user_2,,,sh,sp,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,1.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,join,ysp,已审批,30,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,sp,,,,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,ysh,已审核,40,,,,,,,actor2,user,2,,user_2,2,user_2,,,,2,user_2,,,sh,sp,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,1.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,启动,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_step_instance_link.csv index 9ee23c475..d8e9df14e 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSimpleJoin/output/tables/nop_wf_step_instance_link.csv @@ -1,5 +1,5 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,sh,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,sh,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@var:NopWfStepInstance@stepId_3,sp,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@var:NopWfStepInstance@stepId_3,sp,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,sh,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,sh,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_status_history.csv index ba340edc8..c7edac4ec 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_step_instance.csv index 3f83556e4..d3279db63 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_step_instance.csv @@ -1,4 +1,4 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,end1,结束步骤,70,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,end0,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,action0,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,end0,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,end1,结束步骤,70,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_step_instance_link.csv index cf7f028ab..983bb1546 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeAnd/output/tables/nop_wf_step_instance_link.csv @@ -1,4 +1,4 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@end,_transit_,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,action0,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,action0,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,action0,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@end,_transit_,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_status_history.csv index ba340edc8..6f8f025e2 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_step_instance.csv index dbbf3a0a1..76ec55c4c 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_step_instance.csv @@ -1,3 +1,3 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,end0,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,action0,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,end0,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_step_instance_link.csv index 7735eeba8..3b8df96db 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testSplitTypeOr/output/tables/nop_wf_step_instance_link.csv @@ -1,3 +1,3 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,action0,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@end,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,action0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_status_history.csv index ba340edc8..c7edac4ec 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_step_instance.csv index 17dfdd11f..af24acaef 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_step_instance.csv @@ -1,3 +1,3 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,step5,步骤5,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,step0,步骤0,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,action0,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,step5,步骤5,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_step_instance_link.csv index 3b8df96db..7735eeba8 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign/output/tables/nop_wf_step_instance_link.csv @@ -1,3 +1,3 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@end,_transit_,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,action0,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@end,_transit_,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_action.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_action.csv index 1ed0e2a09..e781b0b78 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_action.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_action.csv @@ -1,5 +1,5 @@ _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_3,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,action0,动作0,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* -A,@var:NopWfAction@sid_2,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,action3,动作3,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* -A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,action0,动作0,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,action0,动作0,@var:NopWfAction@execTime_1,1,user_1,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_2,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,action3,动作3,@var:NopWfAction@execTime_2,1,user_1,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_3,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,action0,动作0,@var:NopWfAction@execTime_3,1,user_1,,,,0,autotest-ref,*,autotest-ref,* A,@var:NopWfAction@sid,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,action0,动作0,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_status_history.csv index ba340edc8..6f8f025e2 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_step_instance.csv index 5fcb31a4a..ad9b3ecbb 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_step_instance.csv @@ -1,6 +1,6 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK +A,@var:NopWfStepInstance@stepId_4,@var:NopWfInstance@wfId,step,step5,步骤5,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime_4,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_4,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,step3,步骤3,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,action0,action3,,@var:NopWfStepInstance@finishTime_2,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,step0,步骤0,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,action0,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_4,@var:NopWfInstance@wfId,step,step5,步骤5,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_4,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,step,step0,步骤0,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,action3,action0,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,step3,步骤3,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,action0,action3,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_2,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,step0,步骤0,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,action0,action0,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_3,@var:NopWfInstance@wfId,step,step0,步骤0,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,action3,action0,,@var:NopWfStepInstance@finishTime_3,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_3,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,step0,步骤0,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,action0,action0,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_step_instance_link.csv index 567463463..2a2c2bfa5 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssign1/output/tables/nop_wf_step_instance_link.csv @@ -1,6 +1,6 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,action0,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_4,@end,_transit_,autotest-ref,* -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,@var:NopWfStepInstance@stepId_4,action0,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_2,@var:NopWfStepInstance@stepId_3,action3,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,action0,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_3,@var:NopWfStepInstance@stepId_4,action0,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@var:NopWfStepInstance@stepId_2,action0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_action.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_action.csv index 182121131..64b5a266b 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_action.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_action.csv @@ -1,3 +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_1,end,审核,@var:NopWfAction@execTime_1,1,user_1,,,,0,autotest-ref,*,autotest-ref,* A,@var:NopWfAction@sid,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,sh,审核,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* -A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,end,审核,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_status_history.csv index ba340edc8..c7edac4ec 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_step_instance.csv index 360e53f5b..4e94ef76c 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_step_instance.csv @@ -1,3 +1,3 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,ysp,已审核,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,end,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,start,启动,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,ysp,已审核,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,sh,end,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_step_instance_link.csv index 6b9697326..740a956af 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testToAssignAnd/output/tables/nop_wf_step_instance_link.csv @@ -1,3 +1,3 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@end,end,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,sh,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@end,end,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_action.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_action.csv index 0016aa04b..2857e3bb1 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_action.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_action.csv @@ -1,3 +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,_withdrawAction,撤回,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* +A,@var:NopWfAction@sid_1,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,_withdrawAction,撤回,@var:NopWfAction@execTime_1,1,user_1,,,,0,autotest-ref,*,autotest-ref,* A,@var:NopWfAction@sid,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,sh,审核,@var:NopWfAction@execTime,1,user_1,,,,0,autotest-ref,*,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_step_instance.csv index 006e5c3e7..c9b451726 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_step_instance.csv @@ -1,4 +1,4 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,ysh,已审核,90,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,sh,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,sh,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId_2,@var:NopWfInstance@wfId,step,wf-start,开始步骤,30,,,,,,,actor1,user,1,,user_1,1,user_1,,,,,,,,_withdrawAction,,,,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,ysh,已审核,90,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,sh,,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_step_instance_link.csv index 2df7ebfbe..6bb1100d1 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWithdraw/output/tables/nop_wf_step_instance_link.csv @@ -1,3 +1,3 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,sh,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_2,_withdrawAction,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,sh,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_status_history.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_status_history.csv index ba340edc8..c7edac4ec 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_status_history.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_status_history.csv @@ -1,3 +1,3 @@ _chgType,SID,WF_ID,FROM_STATUS,TO_STATUS,TO_APP_STATE,CHANGE_TIME,OPERATOR_ID,OPERATOR_NAME,OPERATOR_DEPT_ID,VERSION,CREATED_BY,CREATE_TIME +A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime,1,user_1,,0,autotest-ref,* A,@var:NopWfStatusHistory@sid_1,@var:NopWfInstance@wfId,30,40,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* -A,@var:NopWfStatusHistory@sid,@var:NopWfInstance@wfId,0,30,,@var:NopWfStatusHistory@changeTime_1,1,user_1,,0,autotest-ref,* diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_step_instance.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_step_instance.csv index 640a9caf6..15450fff5 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_step_instance.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_step_instance.csv @@ -1,3 +1,3 @@ _chgType,STEP_ID,WF_ID,STEP_TYPE,STEP_NAME,DISPLAY_NAME,STATUS,APP_STATE,SUB_WF_ID,SUB_WF_NAME,SUB_WF_VERSION,SUB_WF_RESULT_STATUS,IS_READ,ACTOR_MODEL_ID,ACTOR_TYPE,ACTOR_ID,ACTOR_DEPT_ID,ACTOR_NAME,OWNER_ID,OWNER_NAME,OWNER_DEPT_ID,ASSIGNER_ID,ASSIGNER_NAME,CALLER_ID,CALLER_NAME,CANCELLER_ID,CANCELLER_NAME,FROM_ACTION,LAST_ACTION,START_TIME,FINISH_TIME,DUE_TIME,READ_TIME,REMIND_TIME,REMIND_COUNT,NEXT_RETRY_TIME,RETRY_COUNT,ERR_CODE,ERR_MSG,PRIORITY,VOTE_WEIGHT,EXEC_ORDER,JOIN_GROUP,TAG_TEXT,NEXT_STEP_ID,STEP_GROUP,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK +A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,wf-end,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime_1,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, A,@var:NopWfStepInstance@stepId,@var:NopWfInstance@wfId,step,wf-start,开始步骤,40,,,,,,,actor1,user,1,,user_1,1,user_1,,,,1,user_1,,,_start_,action0,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup,0,autotest-ref,*,autotest-ref,*, -A,@var:NopWfStepInstance@stepId_1,@var:NopWfInstance@wfId,step,wf-end,结束步骤,40,,,,,,,actor1,user,2,,user_2,2,user_2,,,,,,,,action0,,,@var:NopWfStepInstance@finishTime,,,,,,,,,100,1,0.0,,,,@var:NopWfStepInstance@stepGroup_1,0,autotest-ref,*,autotest-ref,*, diff --git a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_step_instance_link.csv b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_step_instance_link.csv index 7735eeba8..3b8df96db 100644 --- a/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_step_instance_link.csv +++ b/nop-wf/nop-wf-service/cases/io/nop/wf/service/TestDaoWorkflowEngine/testWorkflowInvoke/output/tables/nop_wf_step_instance_link.csv @@ -1,3 +1,3 @@ _chgType,WF_ID,STEP_ID,NEXT_STEP_ID,EXEC_ACTION,CREATED_BY,CREATE_TIME -A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,action0,autotest-ref,* A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId_1,@end,_transit_,autotest-ref,* +A,@var:NopWfInstance@wfId,@var:NopWfStepInstance@stepId,@var:NopWfStepInstance@stepId_1,action0,autotest-ref,*