From f0f32036f9c431801f35a3a46ba0c9c35557806b Mon Sep 17 00:00:00 2001 From: yubaolee Date: Tue, 24 Jan 2017 16:04:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=A8=A1=E7=89=88=EF=BC=8C=E5=88=97=E8=A1=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/WFProcessInstanceService.cs | 7 ++-- OpenAuth.App/WFSchemeService.cs | 12 ++++--- OpenAuth.Domain/Service/WFFormService.cs | 4 +-- .../Controllers/FlowDesignController.cs | 27 ++++++++++----- ...ntroller.cs => FlowInstancesController.cs} | 16 ++++----- .../Controllers/FlowLaunchController.cs | 10 +----- .../Controllers/FormDesignController.cs | 24 ++++++------- .../FlowManage/Views/FlowDesign/Index.cshtml | 34 ++++++------------- .../PreviewIndex.cshtml | 0 .../Index.cshtml | 2 +- .../ProcessLookForm.cshtml | 0 OpenAuth.Mvc/BllScripts/flowDesign.js | 21 +++++++++++- .../{commonApply.js => flowInstance.js} | 6 ++-- OpenAuth.Mvc/BllScripts/processDetail.js | 2 +- OpenAuth.Mvc/OpenAuth.Mvc.csproj | 10 +++--- 15 files changed, 91 insertions(+), 84 deletions(-) rename OpenAuth.Mvc/Areas/FlowManage/Controllers/{CommonAppliesController.cs => FlowInstancesController.cs} (80%) rename OpenAuth.Mvc/Areas/FlowManage/Views/{FlowLaunch => FlowDesign}/PreviewIndex.cshtml (100%) rename OpenAuth.Mvc/Areas/FlowManage/Views/{CommonApplies => FlowInstances}/Index.cshtml (97%) rename OpenAuth.Mvc/Areas/FlowManage/Views/{CommonApplies => FlowInstances}/ProcessLookForm.cshtml (100%) rename OpenAuth.Mvc/BllScripts/{commonApply.js => flowInstance.js} (96%) diff --git a/OpenAuth.App/WFProcessInstanceService.cs b/OpenAuth.App/WFProcessInstanceService.cs index 66d40a82..6af31cec 100644 --- a/OpenAuth.App/WFProcessInstanceService.cs +++ b/OpenAuth.App/WFProcessInstanceService.cs @@ -333,21 +333,22 @@ namespace OpenAuth.App page = pageCurrent }; + var cnt = _unitWork.Find(u => u.CreateUserId == userid).Count(); if (type == "inbox") //待办事项 { - result.total = _unitWork.Find(u => u.CreateUserId == userid).Count(); + result.total = cnt%pageSize == 0? cnt/pageSize : cnt/pageSize + 1; result.rows = _unitWork.Find(pageCurrent, pageSize, "CreateDate descending", null).ToList(); } else if (type == "outbox") //已办事项 { - result.total = _unitWork.Find(u => u.CreateUserId == userid).Count(); + result.total = cnt % pageSize == 0 ? cnt / pageSize : cnt / pageSize + 1; result.rows = _unitWork.Find(pageCurrent, pageSize, "CreateDate descending", null).ToList(); } else //我的流程 { - result.total = _unitWork.Find(u => u.CreateUserId == userid).Count(); + result.total = cnt % pageSize == 0 ? cnt / pageSize : cnt / pageSize + 1; result.rows = _unitWork.Find(pageCurrent, pageSize, "CreateDate descending", null).ToList(); } diff --git a/OpenAuth.App/WFSchemeService.cs b/OpenAuth.App/WFSchemeService.cs index ee469aeb..e65d1000 100644 --- a/OpenAuth.App/WFSchemeService.cs +++ b/OpenAuth.App/WFSchemeService.cs @@ -2,9 +2,10 @@ using System.Collections.Generic; using System.Linq; using OpenAuth.App.ViewModel; +using OpenAuth.Domain; using OpenAuth.Domain.Interface; -namespace OpenAuth.Domain.Service +namespace OpenAuth.App { /// /// 流程设计服务 @@ -79,10 +80,10 @@ namespace OpenAuth.Domain.Service } } - public void RemoveForm(Guid keyValue) + public void RemoveForm(Guid[] keyValue) { - _unitWork.Delete(u => u.Id == keyValue); - _unitWork.Delete(u =>u.SchemeInfoId == keyValue); + _unitWork.Delete(u =>keyValue.Contains(u.Id)); + _unitWork.Delete(u =>keyValue.Contains(u.SchemeInfoId)); } public WFSchemeInfo GetEntity(Guid keyValue) @@ -113,7 +114,8 @@ namespace OpenAuth.Domain.Service page = pageCurrent }; - result.total = _unitWork.Find(null).Count(); + int cnt = _unitWork.Find(null).Count(); + result.total = cnt%pageSize ==0?cnt/pageSize:cnt/pageSize+1; result.rows = _unitWork.Find(pageCurrent, pageSize, "ModifyDate descending", null).ToList(); return result; diff --git a/OpenAuth.Domain/Service/WFFormService.cs b/OpenAuth.Domain/Service/WFFormService.cs index 869e7a23..6b8b2983 100644 --- a/OpenAuth.Domain/Service/WFFormService.cs +++ b/OpenAuth.Domain/Service/WFFormService.cs @@ -28,9 +28,9 @@ namespace OpenAuth.Domain.Service return _unitWork.FindSingle(u => u.Id == keyValue); } - public void RemoveForm(Guid keyValue) + public void RemoveForm(Guid[] keyValue) { - _unitWork.Delete(u =>u.Id == keyValue); + _unitWork.Delete(u =>keyValue.Contains(u.Id)); } } } diff --git a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs index 572a0d42..1f26087d 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs +++ b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs @@ -9,6 +9,7 @@ using OpenAuth.App; using OpenAuth.App.SSO; using OpenAuth.Domain; using OpenAuth.Domain.Service; +using OpenAuth.Mvc.Controllers; namespace OpenAuth.Mvc.Areas.FlowManage.Controllers { @@ -17,7 +18,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers /// 流程设计 /// 李玉宝新增于2017-01-12 19:41:56 /// - public class FlowDesignController :Controller + public class FlowDesignController :BaseController { private WFSchemeService wfFlowInfoBLL; private UserManagerApp userBLL; @@ -38,6 +39,18 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers { return View(); } + + /// + /// 预览 + /// + /// + [HttpGet] + public ActionResult PreviewIndex() + { + return View(); + } + + /// /// 表单 /// @@ -116,11 +129,10 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers /// 主键值 /// [HttpPost] - [ValidateAntiForgeryToken] - public ActionResult RemoveForm(Guid keyValue) + public string RemoveForm(Guid[] ids) { - wfFlowInfoBLL.RemoveForm(keyValue); - return Content("删除成功。"); + wfFlowInfoBLL.RemoveForm(ids); + return Result.ToJson(); } /// /// 保存用户表单（新增、修改） @@ -129,13 +141,12 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers /// 用户实体 /// [HttpPost] - [ValidateAntiForgeryToken] - public ActionResult SaveForm(string keyValue, string InfoEntity, string ContentEntity, string shcemeAuthorizeData) + public string SaveForm(string keyValue, string InfoEntity, string ContentEntity, string shcemeAuthorizeData) { WFSchemeInfo entyity = InfoEntity.ToObject(); WFSchemeContent contententity = ContentEntity.ToObject(); wfFlowInfoBLL.SaveForm(keyValue, entyity, contententity); - return Content("操作成功。"); + return Result.ToJson(); } /// /// （启用、禁用） diff --git a/OpenAuth.Mvc/Areas/FlowManage/Controllers/CommonAppliesController.cs b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs similarity index 80% rename from OpenAuth.Mvc/Areas/FlowManage/Controllers/CommonAppliesController.cs rename to OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs index c2f28bbd..7349cde1 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Controllers/CommonAppliesController.cs +++ b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs @@ -11,10 +11,10 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers /// 通用申请流程处理 /// 李玉宝新增于2016-09-08 19:21:59 /// - public class CommonAppliesController : Controller + public class FlowInstancesController : BaseController { private WFProcessInstanceService _app; - public CommonAppliesController() + public FlowInstancesController() { _app = AutofacExt.GetFromFac(); } @@ -56,17 +56,17 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers { foreach (var id in ids) { - _app.DeleteProcess(id); + _app.DeleteProcess(id); } + return Result.ToJson(); } - catch (Exception ex) + catch (Exception e) { - - throw; + Result.Status = false; + Result.Message = e.Message; + return Result.ToJson(); } - - return string.Empty; } diff --git a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowLaunchController.cs b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowLaunchController.cs index b494398b..19e37078 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowLaunchController.cs +++ b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowLaunchController.cs @@ -31,15 +31,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers { return View(); } - /// - /// 预览 - /// - /// - [HttpGet] - public ActionResult PreviewIndex() - { - return View(); - } + /// /// 创建流程实例视图 /// diff --git a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs index 259e3f2e..302e2352 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs +++ b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs @@ -1,24 +1,21 @@ using System; using System.Collections.Generic; -using System.Data; using System.Web.Mvc; -using System.Web.UI.WebControls; using Infrastructure; using LeaRun.Util.WebControl; -using OpenAuth.App; -using OpenAuth.Domain; using OpenAuth.Domain.Service; +using OpenAuth.Mvc.Controllers; namespace OpenAuth.Mvc.Areas.FlowManage.Controllers { - public class FormDesignController : Controller + public class FormDesignController : BaseController { - private WFFormService wfFrmMainBLL; + private readonly WFFormService _wfFrmMainBll; public FormDesignController() { - wfFrmMainBLL = AutofacExt.GetFromFac(); + _wfFrmMainBll = AutofacExt.GetFromFac(); } #region 视图功能 @@ -70,7 +67,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers [HttpGet] public ActionResult GetTreeJson() { - var data = wfFrmMainBLL.GetAllList(); + var data = _wfFrmMainBll.GetAllList(); var treeList = new List(); foreach (var item in data) { @@ -97,7 +94,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers [HttpGet] public ActionResult GetFormJson(Guid keyValue) { - var data = wfFrmMainBLL.GetForm(keyValue); + var data = _wfFrmMainBll.GetForm(keyValue); return Content(data.ToJson()); } @@ -108,7 +105,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers [HttpGet] public ActionResult GetAllListJson() { - var data = wfFrmMainBLL.GetAllList(); + var data = _wfFrmMainBll.GetAllList(); return Content(data.ToJson()); } #endregion @@ -117,13 +114,12 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers /// /// 删除表单模板 /// - /// 主键值 + /// 主键值 /// [HttpPost] - [ValidateAntiForgeryToken] - public ActionResult RemoveForm(Guid keyValue) + public ActionResult RemoveForm(Guid[] ids) { - wfFrmMainBLL.RemoveForm(keyValue); + _wfFrmMainBll.RemoveForm(ids); return Content("删除成功。"); } ///// diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/Index.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/Index.cshtml index 126da3e0..24834c6f 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/Index.cshtml +++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/Index.cshtml @@ -7,39 +7,25 @@ -
-
-
-
-
-
-
-
    -
    -
    +
    +
    + @Html.Action("MenuHeader", "Home", new {area=""})
    -
    -
    -
    -
    - @Html.Action("MenuHeader", "Home", new {area=""}) -
    -
    -
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    +
    diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowLaunch/PreviewIndex.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/PreviewIndex.cshtml similarity index 100% rename from OpenAuth.Mvc/Areas/FlowManage/Views/FlowLaunch/PreviewIndex.cshtml rename to OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/PreviewIndex.cshtml diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/CommonApplies/Index.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/Index.cshtml similarity index 97% rename from OpenAuth.Mvc/Areas/FlowManage/Views/CommonApplies/Index.cshtml rename to OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/Index.cshtml index 5c66f640..4af176d3 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Views/CommonApplies/Index.cshtml +++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/Index.cshtml @@ -50,7 +50,7 @@
    - + diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/CommonApplies/ProcessLookForm.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/ProcessLookForm.cshtml similarity index 100% rename from OpenAuth.Mvc/Areas/FlowManage/Views/CommonApplies/ProcessLookForm.cshtml rename to OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/ProcessLookForm.cshtml diff --git a/OpenAuth.Mvc/BllScripts/flowDesign.js b/OpenAuth.Mvc/BllScripts/flowDesign.js index 07397c15..496b6f72 100644 --- a/OpenAuth.Mvc/BllScripts/flowDesign.js +++ b/OpenAuth.Mvc/BllScripts/flowDesign.js @@ -62,7 +62,7 @@ var list = new MainGrid(); //删除 function del() { - list.del("Code", "/WorkflowSchemas/Del", function () { + list.del("Id", "/FlowManage/FlowDesign/RemoveForm", function () { list.reload(); }); } @@ -99,6 +99,25 @@ function add() { }); } +//预览 +function preview() { + var selected = list.getSelectedObj(); + if (selected == null) { + return; + } + + layer.open({ + type: 2, + skin: 'layui-layer-rim', //加上边框 + area: ['1200px', '700px'], //宽高 + maxmin: true, //开启最大化最小化按钮 + content: '/FlowManage/FlowDesign/PreviewIndex?keyValue=' + selected.Id + "&schemeVersion=" + selected.SchemeVersion, + end: function () { + list.reload(); + } + }); +} + //创建新实例 function addInstance() { diff --git a/OpenAuth.Mvc/BllScripts/commonApply.js b/OpenAuth.Mvc/BllScripts/flowInstance.js similarity index 96% rename from OpenAuth.Mvc/BllScripts/commonApply.js rename to OpenAuth.Mvc/BllScripts/flowInstance.js index c652c4f9..3d0a6d87 100644 --- a/OpenAuth.Mvc/BllScripts/commonApply.js +++ b/OpenAuth.Mvc/BllScripts/flowInstance.js @@ -41,7 +41,7 @@ var selectScheme = function(val) { //grid列表模块 function MainGrid() { - var url = "/CommonApplies/Load?type="; + var url = "/FlowInstances/Load?type="; var selectedId = "me"; //ztree选中的模块 this.maingrid = $("#maingrid") .jqGrid({ @@ -129,7 +129,7 @@ var vm = new Vue({ //删除 function del() { list.del("Id", - "/CommonApplies/Delete", + "/FlowInstances/Delete", function() { list.reload(); ztree.reload(); @@ -158,7 +158,7 @@ function detail() { title: selected.Name, skin: "layui-layer-rim", //加上边框 area: ["800px", "600px"], //宽高 - content: "/FlowManage/CommonApplies/ProcessLookForm?processSchemeId=" + selected.ProcessSchemeId + "&activityId="+selected.ActivityId, + content: "/FlowManage/FlowInstances/ProcessLookForm?processSchemeId=" + selected.ProcessSchemeId + "&activityId="+selected.ActivityId, maxmin: true, //开启最大化最小化按钮 end: function() { list.reload(); diff --git a/OpenAuth.Mvc/BllScripts/processDetail.js b/OpenAuth.Mvc/BllScripts/processDetail.js index 4674add0..de82451a 100644 --- a/OpenAuth.Mvc/BllScripts/processDetail.js +++ b/OpenAuth.Mvc/BllScripts/processDetail.js @@ -37,7 +37,7 @@ wfdesignerRedraw(); $(function () { $(".workflowcmd") .on("click", function () { //执行命令 - $.post("/CommonApplies/ExeCmd?id=" +$("#processId").val() +"&cmd=" +$(this).val() , + $.post("/FlowInstances/ExeCmd?id=" +$("#processId").val() +"&cmd=" +$(this).val() , function (data) { if (data.Status) { location.reload(); diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index bb5fee12..c3138580 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -151,7 +151,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -1467,10 +1467,10 @@ - + - + @@ -1491,7 +1491,7 @@ - +