diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Controllers/WfSystemDemoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Controllers/WfSystemDemoController.cs deleted file mode 100644 index 03e22e4ad..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Controllers/WfSystemDemoController.cs +++ /dev/null @@ -1,82 +0,0 @@ -using Learun.Application.TwoDevelopment.SystemDemo; -using Learun.Util; -using System.Web.Mvc; - -namespace Learun.Application.Web.Areas.LR_WorkFlowModule.Controllers -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创建人：陈彬彬 - /// 日 期：2017.04.17 - /// 描 述：系统表单-请假单 - /// - public class WfSystemDemoController : MvcControllerBase - { - #region 请假表单 - // 请假表单后台方法 - DemoleaveIBLL demoleaveIBLL = new DemoleaveBLL(); - - /// - /// 系统请假单(视图) - /// - /// - public ActionResult DemoLeaveForm() - { - return View(); - } - /// - /// 系统请假单(列表视图) - /// - /// - public ActionResult DemoLeaveIndex() - { - return View(); - } - - /// - /// 获取分页数据 - /// - /// 分页参数 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageList(string pagination) - { - Pagination paginationobj = pagination.ToObject(); - var data = demoleaveIBLL.GetPageList(paginationobj); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records, - }; - return JsonResult(jsonData); - } - - - /// - /// 系统请假单(保存数据) - /// - /// - /// - /// - public ActionResult DemoLeaveSaveForm(string keyValue, DemoleaveEntity entity) - { - demoleaveIBLL.SaveEntity(keyValue, entity); - return Success("保存成功"); - } - /// - /// 系统请假单(获取数据) - /// - /// 流程实例主键 - /// - public ActionResult DemoLeaveGetFormData(string processId) - { - var data = demoleaveIBLL.GetEntity(processId); - return JsonResult(data); - } - #endregion - } -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index fc7021bc8..d7e595e09 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -357,6 +357,8 @@ + + @@ -469,7 +471,6 @@ - @@ -810,6 +811,9 @@ + + + @@ -1199,6 +1203,10 @@ + + + + @@ -6474,6 +6482,18 @@ + + + + + + + + + + + + @@ -7315,6 +7335,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_SystemDemo/DemoleaveMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_SystemDemo/DemoleaveMap.cs deleted file mode 100644 index 6dd48fc3a..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_SystemDemo/DemoleaveMap.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Learun.Application.TwoDevelopment.SystemDemo; -using System.Data.Entity.ModelConfiguration; - -namespace Learun.Application.Mapping -{ - public class DemoleaveMap : EntityTypeConfiguration - { - public DemoleaveMap() - { - #region 表、主键 - //表 - this.ToTable("LR_DEMO_FORMLEAVE"); - //主键 - this.HasKey(t => t.F_Id); - #endregion - - #region 配置关系 - #endregion - } - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index cffbcb3b2..ff5bf0590 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -98,6 +98,8 @@ + + @@ -158,7 +160,6 @@ - @@ -568,6 +569,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 79181af19..ce47edc0e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -248,6 +248,14 @@ + + + + + + + + @@ -390,10 +398,6 @@ - - - - @@ -1677,6 +1681,18 @@ + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveBLL.cs deleted file mode 100644 index 5ef2622f1..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveBLL.cs +++ /dev/null @@ -1,92 +0,0 @@ -using Learun.Util; -using System; -using System.Collections.Generic; -namespace Learun.Application.TwoDevelopment.SystemDemo -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创建人：陈彬彬 - /// 日 期：2017.04.17 - /// 描 述：系统表单-请假单 - /// - public class DemoleaveBLL : DemoleaveIBLL - { - private DemoleaveService demoleaveService = new DemoleaveService(); - - #region 获取数据 - /// - /// 获取请假数据列表 - /// - /// 分页 - /// - public IEnumerable GetPageList(Pagination pagination) - { - try - { - return demoleaveService.GetPageList(pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - /// - /// 根据流程实例获取表单数据 - /// - /// - /// - public DemoleaveEntity GetEntity(string processId) - { - try - { - return demoleaveService.GetEntity(processId); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - #endregion - - #region 提交数据 - /// - /// 保存更新数据 - /// - /// 主键 - /// 实体对象 - public void SaveEntity(string keyValue, DemoleaveEntity entity) - { - try - { - demoleaveService.SaveEntity(keyValue, entity); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - #endregion - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveEntity.cs deleted file mode 100644 index a5ccab625..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveEntity.cs +++ /dev/null @@ -1,93 +0,0 @@ -using Learun.Util; -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace Learun.Application.TwoDevelopment.SystemDemo -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创建人：陈彬彬 - /// 日 期：2017.04.17 - /// 描 述：系统表单-请假单 - /// - public class DemoleaveEntity - { - #region 实体成员 - /// - /// F_Id - /// - /// - [Column("F_ID")] - public string F_Id { get; set; } - /// - /// F_Type - /// - /// - [Column("F_TYPE")] - public int? F_Type { get; set; } - /// - /// F_Num - /// - /// - [Column("F_NUM")] - public int? F_Num { get; set; } - /// - /// F_Reason - /// - /// - [Column("F_REASON")] - public string F_Reason { get; set; } - /// - /// F_Begin - /// - /// - [Column("F_BEGIN")] - public DateTime? F_Begin { get; set; } - /// - /// F_End - /// - /// - [Column("F_END")] - public DateTime? F_End { get; set; } - /// - /// F_FileId - /// - /// - [Column("F_FILEID")] - public string F_FileId { get; set; } - /// - /// F_CreateDate - /// - /// - [Column("F_CREATEDATE")] - public DateTime? F_CreateDate { get; set; } - /// - /// F_CreateUserId - /// - /// - [Column("F_CREATEUSERID")] - public string F_CreateUserId { get; set; } - #endregion - - #region 扩展操作 - /// - /// 新增调用 - /// - public void Create() - { - this.F_CreateDate = DateTime.Now; - UserInfo userInfo = LoginUserInfo.Get(); - this.F_CreateUserId = userInfo.userId; - } - /// - /// 编辑调用 - /// - /// - public void Modify(string keyValue) - { - this.F_Id = keyValue; - } - #endregion - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveIBLL.cs deleted file mode 100644 index bd2281793..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveIBLL.cs +++ /dev/null @@ -1,39 +0,0 @@ - -using Learun.Util; -using System.Collections.Generic; -namespace Learun.Application.TwoDevelopment.SystemDemo -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创建人：陈彬彬 - /// 日 期：2017.04.17 - /// 描 述：系统表单-请假单 - /// - public interface DemoleaveIBLL - { - #region 获取数据 - /// - /// 获取请假数据列表 - /// - /// 分页 - /// - IEnumerable GetPageList(Pagination pagination); - /// - /// 根据流程实例获取表单数据 - /// - /// - /// - DemoleaveEntity GetEntity(string processId); - #endregion - - #region 提交数据 - /// - /// 保存更新数据 - /// - /// 主键 - /// 实体对象 - void SaveEntity(string keyValue, DemoleaveEntity entity); - #endregion - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveService.cs deleted file mode 100644 index 4bae6fff1..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveService.cs +++ /dev/null @@ -1,103 +0,0 @@ -using Learun.DataBase.Repository; -using Learun.Util; -using System; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.SystemDemo -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创建人：陈彬彬 - /// 日 期：2017.04.17 - /// 描 述：系统表单-请假单 - /// - public class DemoleaveService : RepositoryFactory - { - #region 获取数据 - /// - /// 获取请假数据列表 - /// - /// 分页 - /// - public IEnumerable GetPageList(Pagination pagination) - { - try - { - return this.BaseRepository().FindList(pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - - /// - /// 根据流程实例获取表单数据 - /// - /// - /// - public DemoleaveEntity GetEntity(string processId) - { - try - { - return this.BaseRepository().FindEntity(processId); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - #endregion - - #region 提交数据 - /// - /// 保存更新数据 - /// - /// 主键 - /// 实体对象 - public void SaveEntity(string keyValue, DemoleaveEntity entity) - { - try - { - if (string.IsNullOrEmpty(keyValue)) - { - entity.Create(); - this.BaseRepository().Insert(entity); - } - else - { - entity.Modify(keyValue); - this.BaseRepository().Update(entity); - } - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - #endregion - } -}