解决冲突

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Controllers/WfSystemDemoController.cs

@@ -1,82 +0,0 @@
-using Learun.Application.TwoDevelopment.SystemDemo;
-using Learun.Util;
-using System.Web.Mvc;
-
-namespace Learun.Application.Web.Areas.LR_WorkFlowModule.Controllers
-{
-    /// <summary>
-    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
-    /// 创建人：陈彬彬
-    /// 日 期：2017.04.17
-    /// 描 述：系统表单-请假单
-    /// </summary>
-    public class WfSystemDemoController : MvcControllerBase
-    {
-        #region  请假表单
-        // 请假表单后台方法
-        DemoleaveIBLL demoleaveIBLL = new DemoleaveBLL();
-
-        /// <summary>
-        /// 系统请假单(视图)
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult DemoLeaveForm()
-        {
-            return View();
-        }
-        /// <summary>
-        /// 系统请假单(列表视图)
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult DemoLeaveIndex()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 获取分页数据
-        /// </summary>
-        /// <param name="pagination">分页参数</param>
-        /// <returns></returns>
-        [HttpGet]
-        [AjaxOnly]
-        public ActionResult GetPageList(string pagination)
-        {
-            Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = demoleaveIBLL.GetPageList(paginationobj);
-            var jsonData = new
-            {
-                rows = data,
-                total = paginationobj.total,
-                page = paginationobj.page,
-                records = paginationobj.records,
-            };
-            return JsonResult(jsonData);
-        }
-
-
-        /// <summary>
-        /// 系统请假单(保存数据)
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        public ActionResult DemoLeaveSaveForm(string keyValue, DemoleaveEntity entity)
-        {
-            demoleaveIBLL.SaveEntity(keyValue, entity);
-            return Success("保存成功");
-        }
-        /// <summary>
-        /// 系统请假单(获取数据)
-        /// </summary>
-        /// <param name="processId">流程实例主键</param>
-        /// <returns></returns>
-        public ActionResult DemoLeaveGetFormData(string processId)
-        {
-            var data = demoleaveIBLL.GetEntity(processId);
-            return JsonResult(data);
-        }
-        #endregion
-    }
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -357,6 +357,8 @@
     <Compile Include="Areas\EducationalAdministration\EducationalAdministrationAreaRegistration.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\APAppointmentPsychologistController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\CompanyNewsController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\ProjectDataManageController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\ProjectPhaseManageController.cs" />
     <Compile Include="Areas\LogisticsManagement\LogisticsManagementAreaRegistration.cs" />
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\AuthorizeController.cs" />
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\FilterIPController.cs" />
@@ -469,7 +471,6 @@
     <Compile Include="Areas\LR_WorkFlowModule\Controllers\WfDelegateRuleController.cs" />
     <Compile Include="Areas\LR_WorkFlowModule\Controllers\WfMonitorController.cs" />
     <Compile Include="Areas\LR_WorkFlowModule\Controllers\WfSchemeController.cs" />
-    <Compile Include="Areas\LR_WorkFlowModule\Controllers\WfSystemDemoController.cs" />
     <Compile Include="Areas\LR_WorkFlowModule\LR_WorkFlowModuleAreaRegistration.cs" />
     <Compile Include="Areas\Permission\PermissionAreaRegistration.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\Emp_PayrollOnceController.cs" />
@@ -810,6 +811,9 @@
     <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\FD_BudgetBasicsController.cs" />
     <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\FD_IncomeManageController.cs" />
     <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\FD_PayManageController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\ProjectTypeManageController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\ProjectManageController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\FillinFromController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\CalculateProjectController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\FormulaMainController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\FormulaChildController.cs" />
@@ -1199,6 +1203,10 @@
     <Content Include="Areas\LogisticsManagement\Views\APAppointmentPsychologist\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectPhaseManage\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectPhaseManage\Index.js" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\AppForm.js" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\Form.css" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\Form.js" />
@@ -6474,6 +6482,18 @@
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\Index.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\Form.cshtml" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectTypeManage\Index.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectTypeManage\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectTypeManage\Form.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectTypeManage\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectManage\Index.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectManage\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectManage\Form.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectManage\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\FillinFrom\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\FillinFrom\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\FillinFrom\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\FillinFrom\Form.js" />
     <Content Include="Areas\LR_Desktop\Views\CalculateProject\Index.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\CalculateProject\Index.js" />
     <Content Include="Areas\LR_Desktop\Views\CalculateProject\Form.cshtml" />
@@ -7315,6 +7335,10 @@
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\FormPublic.cshtml" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_IncomeManage\Form2.cshtml" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_IncomeManage\Form3.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectPhaseManage\Form.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectPhaseManage\Index.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Form.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Index.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\FormulaMain\FormChild.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_SystemDemo/DemoleaveMap.cs

@@ -1,21 +0,0 @@
-using Learun.Application.TwoDevelopment.SystemDemo;
-using System.Data.Entity.ModelConfiguration;
-
-namespace Learun.Application.Mapping
-{
-    public class DemoleaveMap : EntityTypeConfiguration<DemoleaveEntity>
-    {
-        public DemoleaveMap()
-        {
-            #region  表、主键
-            //表
-            this.ToTable("LR_DEMO_FORMLEAVE");
-            //主键
-            this.HasKey(t => t.F_Id);
-            #endregion
- 
-            #region  配置关系
-            #endregion
-        }
-    }
-}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -98,6 +98,8 @@
     <Compile Include="EvaluationTeach\Eval_QuestionItemsMap.cs" />
     <Compile Include="EvaluationTeach\Eval_QuestionMap.cs" />
     <Compile Include="EvaluationTeach\Eval_QuestionResultMap.cs" />
+    <Compile Include="LogisticsManagement\ProjectDataManageMap.cs" />
+    <Compile Include="LogisticsManagement\ProjectPhaseManageMap.cs" />
     <Compile Include="LR_App\DTImgMap.cs" />
     <Compile Include="LR_App\FunctionMap.cs" />
     <Compile Include="LR_App\FunctionSchemeMap.cs" />
@@ -158,7 +160,6 @@
     <Compile Include="LR_Organization\RoleMap.cs" />
     <Compile Include="LR_Organization\UserMap.cs" />
     <Compile Include="LR_Report\ReportTempMap.cs" />
-    <Compile Include="LR_SystemDemo\DemoleaveMap.cs" />
     <Compile Include="LR_System\AnnexesFileMap.cs" />
     <Compile Include="LR_System\CodeRule\CodeRuleMap.cs" />
     <Compile Include="LR_System\CodeRule\CodeRuleSeedMap.cs" />
@@ -568,6 +569,9 @@
     <Compile Include="LR_Desktop\CalculateProjectMap.cs" />
     <Compile Include="LR_Desktop\FormulaMainMap.cs" />
     <Compile Include="LR_Desktop\FormulaChildMap.cs" />
+    <Compile Include="LogisticsManagement\ProjectTypeManageMap.cs" />
+    <Compile Include="LogisticsManagement\ProjectManageMap.cs" />
+    <Compile Include="EducationalAdministration\FillinFromMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -248,6 +248,14 @@
     <Compile Include="Feixing\UserModel.cs" />
     <Compile Include="LogisticsManagement\APAppointmentPsychologist\APAppointmentPsychologistEntity.cs" />
     <Compile Include="LogisticsManagement\CompanyNews\CompanyNewsEntity.cs" />
+    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageBLL.cs" />
+    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageEntity.cs" />
+    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageIBLL.cs" />
+    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageService.cs" />
+    <Compile Include="LogisticsManagement\ProjectPhaseManage\ProjectPhaseManageBLL.cs" />
+    <Compile Include="LogisticsManagement\ProjectPhaseManage\ProjectPhaseManageEntity.cs" />
+    <Compile Include="LogisticsManagement\ProjectPhaseManage\ProjectPhaseManageIBLL.cs" />
+    <Compile Include="LogisticsManagement\ProjectPhaseManage\ProjectPhaseManageService.cs" />
     <Compile Include="LR_CodeDemo\GantProject\GantProjectBLL.cs" />
     <Compile Include="LR_CodeDemo\GantProject\GantProjectIBLL.cs" />
     <Compile Include="LR_CodeDemo\GantProject\GantProjectService.cs" />
@@ -390,10 +398,6 @@
     <Compile Include="StudentWork\SW_Ask_Question\SW_Ask_QuestionIBLL.cs" />
     <Compile Include="StudentWork\SW_Ask_Question\SW_Ask_QuestionService.cs" />
     <Compile Include="StudentWork\SW_Ask_StudentMain\SW_Ask_StudentMainEntity.cs" />
-    <Compile Include="SystemDemo\Demoleave\DemoleaveBLL.cs" />
-    <Compile Include="SystemDemo\Demoleave\DemoleaveEntity.cs" />
-    <Compile Include="SystemDemo\Demoleave\DemoleaveIBLL.cs" />
-    <Compile Include="SystemDemo\Demoleave\DemoleaveService.cs" />
     <Compile Include="LR_Desktop\DTTarget\LR_DT_TargetEntity.cs" />
     <Compile Include="LR_Desktop\DTTarget\DTTargetService.cs" />
     <Compile Include="LR_Desktop\DTTarget\DTTargetBLL.cs" />
@@ -1677,6 +1681,18 @@
     <Compile Include="ReceiveSendFeeManagement\FD_PayManage\FD_PayManageService.cs" />
     <Compile Include="ReceiveSendFeeManagement\FD_PayManage\FD_PayManageBLL.cs" />
     <Compile Include="ReceiveSendFeeManagement\FD_PayManage\FD_PayManageIBLL.cs" />
+    <Compile Include="LogisticsManagement\ProjectTypeManage\ProjectTypeManageEntity.cs" />
+    <Compile Include="LogisticsManagement\ProjectTypeManage\ProjectTypeManageService.cs" />
+    <Compile Include="LogisticsManagement\ProjectTypeManage\ProjectTypeManageBLL.cs" />
+    <Compile Include="LogisticsManagement\ProjectTypeManage\ProjectTypeManageIBLL.cs" />
+    <Compile Include="LogisticsManagement\ProjectManage\ProjectManageEntity.cs" />
+    <Compile Include="LogisticsManagement\ProjectManage\ProjectManageService.cs" />
+    <Compile Include="LogisticsManagement\ProjectManage\ProjectManageBLL.cs" />
+    <Compile Include="LogisticsManagement\ProjectManage\ProjectManageIBLL.cs" />
+    <Compile Include="EducationalAdministration\FillinFrom\FillinFromEntity.cs" />
+    <Compile Include="EducationalAdministration\FillinFrom\FillinFromService.cs" />
+    <Compile Include="EducationalAdministration\FillinFrom\FillinFromBLL.cs" />
+    <Compile Include="EducationalAdministration\FillinFrom\FillinFromIBLL.cs" />
     <Compile Include="LR_Desktop\CalculateProject\CalculateProjectEntity.cs" />
     <Compile Include="LR_Desktop\CalculateProject\CalculateProjectService.cs" />
     <Compile Include="LR_Desktop\CalculateProject\CalculateProjectBLL.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveBLL.cs

@@ -1,92 +0,0 @@
-using Learun.Util;
-using System;
-using System.Collections.Generic;
-namespace Learun.Application.TwoDevelopment.SystemDemo
-{
-    /// <summary>
-    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
-    /// 创建人：陈彬彬
-    /// 日 期：2017.04.17
-    /// 描 述：系统表单-请假单
-    /// </summary>
-    public class DemoleaveBLL : DemoleaveIBLL
-    {
-        private DemoleaveService demoleaveService = new DemoleaveService();
-
-        #region  获取数据
-        /// <summary>
-        /// 获取请假数据列表
-        /// </summary>
-        /// <param name="pagination">分页</param>
-        /// <returns></returns>
-        public IEnumerable<DemoleaveEntity> GetPageList(Pagination pagination)
-        {
-            try
-            {
-                return demoleaveService.GetPageList(pagination);
-            }
-            catch (Exception ex)
-            {
-                if (ex is ExceptionEx)
-                {
-                    throw;
-                }
-                else
-                {
-                    throw ExceptionEx.ThrowBusinessException(ex);
-                }
-            }
-        } 
-        /// <summary>
-        /// 根据流程实例获取表单数据
-        /// </summary>
-        /// <param name="processId"></param>
-        /// <returns></returns>
-        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  提交数据
-        /// <summary>
-        /// 保存更新数据
-        /// </summary>
-        /// <param name="keyValue">主键</param>
-        /// <param name="entity">实体对象</param>
-        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
-    }
-}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveEntity.cs

@@ -1,93 +0,0 @@
-using Learun.Util;
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Learun.Application.TwoDevelopment.SystemDemo
-{
-    /// <summary>
-    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
-    /// 创建人：陈彬彬
-    /// 日 期：2017.04.17
-    /// 描 述：系统表单-请假单
-    /// </summary>
-    public class DemoleaveEntity
-    {
-        #region  实体成员
-        /// <summary>
-        /// F_Id
-        /// </summary>
-        /// <returns></returns>
-        [Column("F_ID")]
-        public string F_Id { get; set; }
-        /// <summary>
-        /// F_Type
-        /// </summary>
-        /// <returns></returns>
-        [Column("F_TYPE")]
-        public int? F_Type { get; set; }
-        /// <summary>
-        /// F_Num
-        /// </summary>
-        /// <returns></returns>
-        [Column("F_NUM")]
-        public int? F_Num { get; set; }
-        /// <summary>
-        /// F_Reason
-        /// </summary>
-        /// <returns></returns>
-        [Column("F_REASON")]
-        public string F_Reason { get; set; }
-        /// <summary>
-        /// F_Begin
-        /// </summary>
-        /// <returns></returns>
-        [Column("F_BEGIN")]
-        public DateTime? F_Begin { get; set; }
-        /// <summary>
-        /// F_End
-        /// </summary>
-        /// <returns></returns>
-        [Column("F_END")]
-        public DateTime? F_End { get; set; }
-        /// <summary>
-        /// F_FileId
-        /// </summary>
-        /// <returns></returns>
-        [Column("F_FILEID")]
-        public string F_FileId { get; set; }
-        /// <summary>
-        /// F_CreateDate
-        /// </summary>
-        /// <returns></returns>
-        [Column("F_CREATEDATE")]
-        public DateTime? F_CreateDate { get; set; }
-        /// <summary>
-        /// F_CreateUserId
-        /// </summary>
-        /// <returns></returns>
-        [Column("F_CREATEUSERID")]
-        public string F_CreateUserId { get; set; }
-        #endregion
-
-        #region  扩展操作
-        /// <summary>
-        /// 新增调用
-        /// </summary>
-        public void Create()
-        {
-            this.F_CreateDate = DateTime.Now;
-            UserInfo userInfo = LoginUserInfo.Get();
-            this.F_CreateUserId = userInfo.userId;
-        }
-        /// <summary>
-        /// 编辑调用
-        /// </summary>
-        /// <param name="keyValue"></param>
-        public void Modify(string keyValue)
-        {
-            this.F_Id = keyValue;
-        }
-        #endregion
-    }
-}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveIBLL.cs

@@ -1,39 +0,0 @@
-
-using Learun.Util;
-using System.Collections.Generic;
-namespace Learun.Application.TwoDevelopment.SystemDemo
-{
-    /// <summary>
-    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
-    /// 创建人：陈彬彬
-    /// 日 期：2017.04.17
-    /// 描 述：系统表单-请假单
-    /// </summary>
-    public interface DemoleaveIBLL
-    {
-        #region  获取数据
-         /// <summary>
-        /// 获取请假数据列表
-        /// </summary>
-        /// <param name="pagination">分页</param>
-        /// <returns></returns>
-        IEnumerable<DemoleaveEntity> GetPageList(Pagination pagination);
-        /// <summary>
-        /// 根据流程实例获取表单数据
-        /// </summary>
-        /// <param name="processId"></param>
-        /// <returns></returns>
-        DemoleaveEntity GetEntity(string processId);
-        #endregion
-
-        #region  提交数据
-        /// <summary>
-        /// 保存更新数据
-        /// </summary>
-        /// <param name="keyValue">主键</param>
-        /// <param name="entity">实体对象</param>
-        void SaveEntity(string keyValue, DemoleaveEntity entity);
-        #endregion
-    }
-}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/SystemDemo/Demoleave/DemoleaveService.cs

@@ -1,103 +0,0 @@
-using Learun.DataBase.Repository;
-using Learun.Util;
-using System;
-using System.Collections.Generic;
-
-namespace Learun.Application.TwoDevelopment.SystemDemo
-{
-    /// <summary>
-    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
-    /// 创建人：陈彬彬
-    /// 日 期：2017.04.17
-    /// 描 述：系统表单-请假单
-    /// </summary>
-    public class DemoleaveService : RepositoryFactory
-    {
-        #region  获取数据
-        /// <summary>
-        /// 获取请假数据列表
-        /// </summary>
-        /// <param name="pagination">分页</param>
-        /// <returns></returns>
-        public IEnumerable<DemoleaveEntity> GetPageList(Pagination pagination)
-        {
-            try
-            {
-                return this.BaseRepository().FindList<DemoleaveEntity>(pagination);
-            }
-            catch (Exception ex)
-            {
-                if (ex is ExceptionEx)
-                {
-                    throw;
-                }
-                else
-                {
-                    throw ExceptionEx.ThrowServiceException(ex);
-                }
-            }
-        } 
-
-
-        /// <summary>
-        /// 根据流程实例获取表单数据
-        /// </summary>
-        /// <param name="processId"></param>
-        /// <returns></returns>
-        public DemoleaveEntity GetEntity(string processId)
-        {
-            try
-            {
-                return this.BaseRepository().FindEntity<DemoleaveEntity>(processId);
-            }
-            catch (Exception ex)
-            {
-                if (ex is ExceptionEx)
-                {
-                    throw;
-                }
-                else
-                {
-                    throw ExceptionEx.ThrowServiceException(ex);
-                }
-            }
-        }
-        #endregion
-
-        #region  提交数据
-        /// <summary>
-        /// 保存更新数据
-        /// </summary>
-        /// <param name="keyValue">主键</param>
-        /// <param name="entity">实体对象</param>
-        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
-    }
-}