lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-07-15 23:13:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: 修改approvetype类型

Browse Source
This commit is contained in:
yubaolee 2025-04-17 17:20:23 +08:00
parent 8359e21fdd
commit b5bb518bd2
8 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Infrastructure/Define.cs
View File

@ -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";

4
OpenAuth.App/FlowApproverApp/FlowApproverApp.cs
View File

@ -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

4
OpenAuth.App/FlowApproverApp/Request/AddApproverReq.cs
View File

@ -28,9 +28,9 @@ namespace OpenAuth.App.Request
/// <summary>
///类型（0顺序，1并行且，2并行或）
///类型（sequential顺序，all并行且，one并行或）
/// </summary>
public int ApproveType { get; set; }
public string ApproveType { get; set; }
/// <summary>
///父节点ID，应对多次加签

8
OpenAuth.Repository/Domain/FlowApprover.cs
View File

@ -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; }
/// <summary>
///类型（0顺序，1并行且，2并行或）
///类型（sequential顺序，all并行且，one并行或）
/// </summary>
[Description("类型（0顺序，1并行且，2并行或）")]
public int ApproveType { get; set; }
[Description("类型（sequential顺序，all并行且，one并行或）")]
public string ApproveType { get; set; }
/// <summary>
///加签时间

2
数据库脚本/MySql.sql
View File

@ -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时）',

2
数据库脚本/Oracle.sql
View File

@ -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),

4
数据库脚本/SqlServer.sql
View File

@ -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'

2
数据库脚本/postgreSql.sql
View File

@ -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,