wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.4.6

Browse Source
This commit is contained in:
潘飞
2023-05-31 10:19:05 +08:00
parent 1b65a7a9e5
commit 9c621c75cd
238 changed files with 9905 additions and 4034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/Tnb.WorkFlow.Entitys/Dto/FlowBefore/FlowBeforeListOutput.cs
View File

@@ -132,5 +132,13 @@ public class FlowBeforeListOutput
/// </summary>
public string? templateId { get; set; }
}
/// <summary>
/// 委托发起人.
/// </summary>
public string? delegateUser { get; set; }
/// <summary>
/// 挂起（0：否，1：是）.
/// </summary>
public int? suspend { get; set; }
}

7
workflow/Tnb.WorkFlow.Entitys/Dto/FlowBefore/FlowBeforeListQuery.cs
View File

@@ -17,7 +17,12 @@ public class FlowBeforeListQuery : PageInputBase
public long? endTime { get; set; }
/// <summary>
/// 引擎id.
/// 所属流程.
/// </summary>
public string templateId { get; set; }
/// <summary>
/// 所属流程.
/// </summary>
public string flowId { get; set; }

7
workflow/Tnb.WorkFlow.Entitys/Dto/FlowLaunch/FlowLaunchListOutput.cs
View File

@@ -106,7 +106,12 @@ public class FlowLaunchListOutput
public long? sortCode { get; set; }
/// <summary>
/// 委托发起人
/// 委托发起人.
/// </summary>
public string? delegateUser { get; set; }
/// <summary>
/// 挂起（0：否，1：是）.
/// </summary>
public int? suspend { get; set; }
}

5
workflow/Tnb.WorkFlow.Entitys/Dto/FlowLaunch/FlowLaunchListQuery.cs
View File

@@ -14,6 +14,11 @@ public class FlowLaunchListQuery : PageInputBase
/// <summary>
/// 所属流程.
/// </summary>
public string? templateId { get; set; }
/// <summary>
/// 所属名称.
/// </summary>
public string? flowId { get; set; }
/// <summary>

10
workflow/Tnb.WorkFlow.Entitys/Dto/FlowMonitor/FlowMonitorListOutput.cs
View File

@@ -114,4 +114,14 @@ public class FlowMonitorListOutput
/// 流程主表id.
/// </summary>
public string? templateId { get; set; }
/// <summary>
/// 挂起（0：否，1：是）.
/// </summary>
public int? suspend { get; set; }
/// <summary>
/// 版本.
/// </summary>
public string? flowVersion { get; set; }
}

9
workflow/Tnb.WorkFlow.Entitys/Dto/FlowMonitor/FlowMonitorListQuery.cs
View File

@@ -27,9 +27,9 @@ public class FlowMonitorListQuery : PageInputBase
public long? endTime { get; set; }
/// <summary>
/// 流程主键.
/// 所属流程.
/// </summary>
public string? flowId { get; set; }
public string? templateId { get; set; }
/// <summary>
/// 流程状态.
@@ -40,4 +40,9 @@ public class FlowMonitorListQuery : PageInputBase
/// 紧急程度.
/// </summary>
public int? flowUrgent { get; set; }
/// <summary>
/// 所属名称.
/// </summary>
public string? flowId { get; set; }
}

31
workflow/Tnb.WorkFlow.Entitys/Dto/FlowTemplate/FlowJsonInfo.cs Normal file
View File

@@ -0,0 +1,31 @@
using JNPF.WorkFlow.Entitys.Model;
namespace JNPF.WorkFlow.Entitys.Dto.FlowTemplate;
public class FlowJsonInfo
{
/// <summary>
/// id.
/// </summary>
public string? id { get; set; }
/// <summary>
/// 流程编码.
/// </summary>
public string? flowId { get; set; }
/// <summary>
/// 流程名称.
/// </summary>
public string? fullName { get; set; }
/// <summary>
/// 流程JOSN包.
/// </summary>
public FlowTemplateJsonModel? flowTemplateJson { get; set; }
/// <summary>
/// 是否删除.
/// </summary>
public bool? isDelete { get; set; }
}

2
workflow/Tnb.WorkFlow.Entitys/Dto/FlowTemplate/FlowTemplateImportOutput.cs
View File

@@ -14,7 +14,7 @@ public class FlowTemplateImportOutput
/// <summary>
/// 流程实例.
/// </summary>
public FlowTemplateJsonEntity flowTemplateJson { get; set; }
public List<FlowTemplateJsonEntity> flowTemplateJson { get; set; }
/// <summary>
/// 流程可见范围.

15
workflow/Tnb.WorkFlow.Entitys/Dto/FlowTemplate/FlowTemplateInfoOutput.cs
View File

@@ -53,4 +53,19 @@ public class FlowTemplateInfoOutput
/// 流程设计信息.
/// </summary>
public string? flowTemplateJson { get; set; }
/// <summary>
/// 是否在线开发.
/// </summary>
public bool? onlineDev { get; set; }
/// <summary>
/// 启用标识.
/// </summary>
public int? enabledMark { get; set; }
/// <summary>
/// 在线开发流程表单id.
/// </summary>
public string? onlineFormId { get; set; }
}

10
workflow/Tnb.WorkFlow.Entitys/Dto/FlowTemplate/FlowTemplateJsonInfoOutput.cs
View File

@@ -14,6 +14,11 @@ public class FlowTemplateJsonInfoOutput
/// </summary>
public string? templateId { get; set; }
/// <summary>
/// 流程名称.
/// </summary>
public string? fullName { get; set; }
/// <summary>
/// 可见范围.
/// </summary>
@@ -53,4 +58,9 @@ public class FlowTemplateJsonInfoOutput
/// 标识.
/// </summary>
public int? enabledMark { get; set; }
/// <summary>
/// 排序码.
/// </summary>
public long? sortCode { get; set; }
}

5
workflow/Tnb.WorkFlow.Entitys/Dto/FlowTemplate/FlowTemplateListQuery.cs
View File

@@ -24,4 +24,9 @@ public class FlowTemplateListQuery : PageInputBase
/// 0:发起流程 1:功能流程.
/// </summary>
public int? flowType { get; set; }
/// <summary>
/// 所属流程.
/// </summary>
public string? flowId { get; set; }
}

6
workflow/Tnb.WorkFlow.Entitys/Entity/FlowTaskEntity.cs
View File

@@ -182,4 +182,10 @@ public class FlowTaskEntity : CLDEntityBase
/// </summary>
[SugarColumn(ColumnName = "F_DELEGATEUSER")]
public string? DelegateUser { get; set; }
/// <summary>
/// 挂起（0：否，1：是）.
/// </summary>
[SugarColumn(ColumnName = "F_Suspend")]
public int? Suspend { get; set; }
}

18
workflow/Tnb.WorkFlow.Entitys/Entity/FlowTaskOperatorUserEntity.cs
View File

@@ -23,18 +23,6 @@ public class FlowTaskOperatorUserEntity : EntityBase<string>
[SugarColumn(ColumnName = "F_HANDLEID")]
public string? HandleId { get; set; }
/// <summary>
/// 处理状态：【0-拒绝、1-同意】.
/// </summary>
[SugarColumn(ColumnName = "F_HANDLESTATUS")]
public int? HandleStatus { get; set; }
/// <summary>
/// 处理时间.
/// </summary>
[SugarColumn(ColumnName = "F_HANDLETIME")]
public DateTime? HandleTime { get; set; }
/// <summary>
/// 节点编码.
/// </summary>
@@ -95,12 +83,6 @@ public class FlowTaskOperatorUserEntity : EntityBase<string>
[SugarColumn(ColumnName = "F_PARENTID")]
public string? ParentId { get; set; }
/// <summary>
/// 保存数据.
/// </summary>
[SugarColumn(ColumnName = "F_DRAFTDATA")]
public string? DraftData { get; set; }
/// <summary>
/// 排序.
/// </summary>

18
workflow/Tnb.WorkFlow.Entitys/Entity/FlowTemplateJsonEntity.cs
View File

@@ -34,4 +34,22 @@ public class FlowTemplateJsonEntity : CLDEntityBase
/// </summary>
[SugarColumn(ColumnName = "F_FLOWTEMPLATEJSON")]
public string? FlowTemplateJson { get; set; }
/// <summary>
/// 流程名称.
/// </summary>
[SugarColumn(ColumnName = "F_FULLNAME")]
public string? FullName { get; set; }
/// <summary>
/// 排序码.
/// </summary>
[SugarColumn(ColumnName = "F_SORTCODE")]
public long? SortCode { get; set; }
/// <summary>
/// 分组id.
/// </summary>
[SugarColumn(ColumnName = "F_GROUPID")]
public string? GroupId { get; set; }
}

15
workflow/Tnb.WorkFlow.Entitys/Model/FlowHandleModel.cs
View File

@@ -86,6 +86,11 @@ public class FlowHandleModel : PageInputBase
/// </summary>
public string taskId { get; set; }
/// <summary>
/// 任务id.
/// </summary>
public string id { get; set; }
/// <summary>
/// false 变更 true 复活.
/// </summary>
@@ -100,4 +105,14 @@ public class FlowHandleModel : PageInputBase
/// 驳回节点.
/// </summary>
public string rejectStep { get; set; }
/// <summary>
/// true 全部 flase 主流程.
/// </summary>
public bool suspend { get; set; }
/// <summary>
/// 驳回类型.
/// </summary>
public string rejectType { get; set; }
}

5
workflow/Tnb.WorkFlow.Entitys/Model/FlowTaskModel.cs
View File

@@ -124,4 +124,9 @@ public class FlowTaskModel
/// 标识.
/// </summary>
public int? enabledMark { get; set; }
/// <summary>
/// 是否挂起.
/// </summary>
public bool suspend { get; set; }
}

29
workflow/Tnb.WorkFlow.Entitys/Model/FlowTemplateModel.cs
View File

@@ -1,29 +0,0 @@
using JNPF.DependencyInjection;
using Newtonsoft.Json.Linq;
namespace JNPF.WorkFlow.Entitys.Model;
[SuppressSniffer]
public class FlowTemplateModel
{
/// <summary>
/// id.
/// </summary>
public string id { get; set; } = "";
/// <summary>
/// 流程id.
/// </summary>
public string flowId { get; set; } = "";
/// <summary>
/// 流程名称.
/// </summary>
public string fullName { get; set; } = "";
/// <summary>
/// 子节点.
/// </summary>
public FlowTemplateJsonModel? flowTemplateJson { get; set; }
}

5
workflow/Tnb.WorkFlow.Entitys/Model/Item/ConditionsItem.cs
View File

@@ -45,6 +45,11 @@ public class ConditionsItem
/// </summary>
public string? jnpfKey { get; set; }
/// <summary>
/// 控件类型.
/// </summary>
public string? fieldValueJnpfKey { get; set; }
/// <summary>
/// 条件类型 1：字段 3:聚合函数匹配.
/// </summary>

7
workflow/Tnb.WorkFlow.Entitys/Model/PortalWaitListModel.cs
View File

@@ -59,4 +59,9 @@ public class PortalWaitListModel
/// 类型.
/// </summary>
public int? type { get; set; }
}
/// <summary>
/// 委托发起人.
/// </summary>
public string? delegateUser { get; set; }
}

7
workflow/Tnb.WorkFlow.Entitys/Model/Properties/ApproversProperties.cs
View File

@@ -95,7 +95,7 @@ public class ApproversProperties
/// <summary>
/// 打印id.
/// </summary>
public string? printId { get; set; }
public List<string> printId { get; set; } = new List<string>();
/// <summary>
/// 表单字段审核方式的类型(1-用户 2-部门).
@@ -150,6 +150,11 @@ public class ApproversProperties
/// </summary>
public List<AssignItem>? assignList { get; set; }
/// <summary>
/// 是否抄送发起人.
/// </summary>
public bool isInitiatorCopy { get; set; }
#region 人员
/// <summary>

2
workflow/Tnb.WorkFlow.Entitys/Model/Properties/StartProperties.cs
View File

@@ -69,7 +69,7 @@ public class StartProperties
/// <summary>
/// 打印id.
/// </summary>
public string? printId { get; set; }
public List<string> printId { get; set; } = new List<string>();
/// <summary>
/// 是否评论.