diff --git a/Infrastructure/Define.cs b/Infrastructure/Define.cs
index 862ee069..6afae1d2 100644
--- a/Infrastructure/Define.cs
+++ b/Infrastructure/Define.cs
@@ -79,6 +79,11 @@
public const string RUNTIME_SPECIAL_ROLE = "RUNTIME_SPECIAL_ROLE"; //运行时指定角色
public const string RUNTIME_SPECIAL_USER = "RUNTIME_SPECIAL_USER"; //运行时指定用户
+ //加签类型
+ public const string APPROVE_TYPE_SEQUENTIAL = "sequential"; //顺序
+ public const string APPROVE_TYPE_ALL = "all"; //并行且
+ public const string APPROVE_TYPE_ONE = "one"; //并行或
+
public const string API = "API_RESOURCE";
diff --git a/OpenAuth.App/FlowApproverApp/FlowApproverApp.cs b/OpenAuth.App/FlowApproverApp/FlowApproverApp.cs
index fafa5f88..ba6376ca 100644
--- a/OpenAuth.App/FlowApproverApp/FlowApproverApp.cs
+++ b/OpenAuth.App/FlowApproverApp/FlowApproverApp.cs
@@ -112,7 +112,7 @@ namespace OpenAuth.App
}
//如果是顺序执行,取第一个人
- if (query.First().ApproveType == 0)
+ if (query.First().ApproveType == Define.APPROVE_TYPE_SEQUENTIAL)
{
var result = query.OrderBy(u => u.OrderNo).First();
return new[] { result };
@@ -138,7 +138,7 @@ namespace OpenAuth.App
VerifyDate = DateTime.Now
}, u => u.Id == verifyApproverReq.Id);
- if (approve.ApproveType == 2)
+ if (approve.ApproveType == Define.APPROVE_TYPE_ONE)
{
//如果是并行或,只需要一个审批通过即可
return Repository.IsAny(u => u.InstanceId == approve.InstanceId
diff --git a/OpenAuth.App/FlowApproverApp/Request/AddApproverReq.cs b/OpenAuth.App/FlowApproverApp/Request/AddApproverReq.cs
index 6b6c17bd..0fc406b7 100644
--- a/OpenAuth.App/FlowApproverApp/Request/AddApproverReq.cs
+++ b/OpenAuth.App/FlowApproverApp/Request/AddApproverReq.cs
@@ -28,9 +28,9 @@ namespace OpenAuth.App.Request
///
- ///类型(0顺序,1并行且,2并行或)
+ ///类型(sequential顺序,all并行且,one并行或)
///
- public int ApproveType { get; set; }
+ public string ApproveType { get; set; }
///
///父节点ID,应对多次加签
diff --git a/OpenAuth.Repository/Domain/FlowApprover.cs b/OpenAuth.Repository/Domain/FlowApprover.cs
index 41555bc8..2d029fc7 100644
--- a/OpenAuth.Repository/Domain/FlowApprover.cs
+++ b/OpenAuth.Repository/Domain/FlowApprover.cs
@@ -27,7 +27,7 @@ namespace OpenAuth.Repository.Domain
this.VerifyComment = "";
this.CascadeId = "";
this.ApproverId = "";
- this.ApproveType = 0;
+ this.ApproveType = "";
this.CreateDate = DateTime.Now;
this.CreateUserName = "";
this.ParentId = "";
@@ -70,10 +70,10 @@ namespace OpenAuth.Repository.Domain
public string ApproverId { get; set; }
///
- ///类型(0顺序,1并行且,2并行或)
+ ///类型(sequential顺序,all并行且,one并行或)
///
- [Description("类型(0顺序,1并行且,2并行或)")]
- public int ApproveType { get; set; }
+ [Description("类型(sequential顺序,all并行且,one并行或)")]
+ public string ApproveType { get; set; }
///
///加签时间
diff --git a/数据库脚本/MySql.sql b/数据库脚本/MySql.sql
index b6dc10e0..816fd572 100644
--- a/数据库脚本/MySql.sql
+++ b/数据库脚本/MySql.sql
@@ -327,7 +327,7 @@ CREATE TABLE `flowapprover` (
`createuserid` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '加签人Id',
`createusername` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '加签人',
`status` int(11) NOT NULL COMMENT '状态(0未处理,1通过,2未通过,3驳回)',
- `approvetype` int(11) NOT NULL COMMENT '类型(0顺序,1并行且,2并行或)',
+ `approvetype` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型(sequential顺序,all并行且,one并行或)',
`approverid` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '审批人ID',
`approvername` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '审批人',
`orderno` int(11) NULL DEFAULT NULL COMMENT '顺序号(当类型为0时)',
diff --git a/数据库脚本/Oracle.sql b/数据库脚本/Oracle.sql
index a4b2bac3..2437f3a9 100644
--- a/数据库脚本/Oracle.sql
+++ b/数据库脚本/Oracle.sql
@@ -562,7 +562,7 @@ CREATE TABLE "FLOWAPPROVER" (
"CREATEUSERID" NVARCHAR2(50),
"CREATEUSERNAME" NVARCHAR2(50),
"STATUS" NUMBER(11,0) NOT NULL,
- "APPROVETYPE" NUMBER(11,0) NOT NULL,
+ "APPROVETYPE" NVARCHAR2(50) NOT NULL,
"APPROVERID" NVARCHAR2(50) NOT NULL,
"APPROVERNAME" NVARCHAR2(50),
"ORDERNO" NUMBER(11,0),
diff --git a/数据库脚本/SqlServer.sql b/数据库脚本/SqlServer.sql
index 459367a2..d52c66d7 100644
--- a/数据库脚本/SqlServer.sql
+++ b/数据库脚本/SqlServer.sql
@@ -1449,7 +1449,7 @@ CREATE TABLE [dbo].[FlowApprover] (
[CreateUserId] varchar(50) COLLATE Chinese_PRC_CI_AS NULL,
[CreateUserName] varchar(50) COLLATE Chinese_PRC_CI_AS NULL,
[Status] int NOT NULL,
- [ApproveType] int NOT NULL,
+ [ApproveType] varchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL,
[ApproverId] varchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL,
[ApproverName] varchar(50) COLLATE Chinese_PRC_CI_AS NULL,
[OrderNo] int NULL,
@@ -1523,7 +1523,7 @@ EXEC sp_addextendedproperty
GO
EXEC sp_addextendedproperty
-'MS_Description', N'类型(0顺序,1并行且,2并行或)',
+'MS_Description', N'类型(sequential顺序,all并行且,one并行或)',
'SCHEMA', N'dbo',
'TABLE', N'FlowApprover',
'COLUMN', N'ApproveType'
diff --git a/数据库脚本/postgreSql.sql b/数据库脚本/postgreSql.sql
index b350c01e..518b7276 100644
--- a/数据库脚本/postgreSql.sql
+++ b/数据库脚本/postgreSql.sql
@@ -466,7 +466,7 @@ CREATE TABLE "public"."flowapprover" (
"createuserid" varchar(50) COLLATE "pg_catalog"."default",
"createusername" varchar(50) COLLATE "pg_catalog"."default",
"status" int4 NOT NULL,
- "approvetype" int4 NOT NULL,
+ "approvetype" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,
"approverid" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,
"approvername" varchar(50) COLLATE "pg_catalog"."default",
"orderno" int4,