From 151311b79d5308bf36a2e60742e75672e5568be2 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Tue, 1 Sep 2020 17:29:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1=EF=BC=9A?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E2=80=9C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E2=80=9D=E5=88=97=EF=BC=8C=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E2=80=9C=E6=A8=A1=E6=9D=BF=E7=B1=BB=E5=9E=8B=E2=80=9C=E4=B8=BA?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=B5=81=E7=A8=8B=E3=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=B5=81=E7=A8=8B=E7=9A=84=E5=8D=95=E9=80=89=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/NWFScheme/Form.cshtml | 22 +++++++++++++++---- .../LR_NewWorkFlow/Views/NWFScheme/Index.js | 10 +++++++++ .../Scheme/NWFSchemeInfoEntity.cs | 5 +++++ .../Scheme/NWFSchemeService.cs | 4 ++-- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Form.cshtml index ec967f5ac..4a903076c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Form.cshtml @@ -43,6 +43,19 @@
+
模板类型*
+
+ + +
+
+
我的任务*
-
+
移动端*
-
+
撤销作废执行*
-
+
@@ -122,7 +135,8 @@
-
+ +
备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Index.js index 33c30ce2d..c023947e6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Index.js @@ -226,6 +226,16 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "类型", name: "F_Kind", width: 100, align: "center", + formatter: function (cellvalue, row) { + if (cellvalue == 1) { + return '自定义流程'; + } else { + return '系统流程'; + } + } + }, { label: "状态", name: "F_EnabledMark", width: 50, align: "center", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeInfoEntity.cs index 5e1eb016b..e65ad98c5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeInfoEntity.cs @@ -73,6 +73,11 @@ namespace Learun.Application.WorkFlow /// [Column("IMGURL")] public string imgUrl { get; set; } + /// + /// 流程类型1自定义流程0系统流程 + /// + [Column("F_KIND")] + public int? F_Kind { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeService.cs index deda5e077..814391f84 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeService.cs @@ -87,7 +87,7 @@ namespace Learun.Application.WorkFlow var strSql = new StringBuilder(); strSql.Append("SELECT * "); - strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE t.F_EnabledMark = 1 AND t.F_Mark = 1 AND t.F_Id in " + schemeinfoIds); + strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE t.F_EnabledMark = 1 AND t.F_Mark = 1 AND t.F_Kind = 1 AND t.F_Id in " + schemeinfoIds); return this.BaseRepository().FindList(strSql.ToString()); } @@ -157,7 +157,7 @@ namespace Learun.Application.WorkFlow var strSql = new StringBuilder(); strSql.Append("SELECT * "); - strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE t.F_EnabledMark = 1 AND t.F_Mark = 1 AND F_IsInApp = 1 AND t.F_Id in " + schemeinfoIds); + strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE t.F_EnabledMark = 1 AND t.F_Mark = 1 AND F_IsInApp = 1 AND t.F_Kind = 1 AND t.F_Id in " + schemeinfoIds); var queryParam = queryJson.ToJObject(); string keyword = "";