diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/工资项目Controller.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/工资项目Controller.cs index 3b3f42886..0d4929d49 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/工资项目Controller.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/工资项目Controller.cs @@ -13,9 +13,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers /// 日 期:2021-04-20 16:52 /// 描 述:工资条 /// - public class 工资项目Controller : MvcControllerBase + public class EmpPayrollController : MvcControllerBase { - private 工资项目IBLL 工资项目IBLL = new 工资项目BLL(); + private SalarySheetIBLL Emps = new SalarySheetBLL(); #region 视图功能 @@ -52,7 +52,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers public ActionResult GetPageList(string pagination, string queryJson) { Pagination paginationobj = pagination.ToObject(); - var data = 工资项目IBLL.GetPageList(paginationobj, queryJson); + var data = Emps.GetPageList(paginationobj, queryJson); var jsonData = new { rows = data, @@ -71,7 +71,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var EMP_PayrollData = 工资项目IBLL.GetEMP_PayrollEntity( keyValue ); + var EMP_PayrollData = Emps.GetSalarySheetEntity( keyValue ); var jsonData = new { EMP_Payroll = EMP_PayrollData, }; @@ -88,9 +88,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers /// [HttpPost] [AjaxOnly] - public ActionResult DeleteForm( keyValue) + public ActionResult DeleteForm( string keyValue) { - 工资项目IBLL.DeleteEntity(keyValue); + Emps.DeleteEntity(keyValue); return Success("删除成功!"); } /// @@ -102,10 +102,10 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [HttpPost] [ValidateAntiForgeryToken] [AjaxOnly] - public ActionResult SaveForm( keyValue, string strEntity) + public ActionResult SaveForm(string keyValue, string strEntity) { - EMP_PayrollEntity entity = strEntity.ToObject(); - 工资项目IBLL.SaveEntity(keyValue,entity); + SalarySheetEntity entity = strEntity.ToObject(); + Emps.SaveEntity(keyValue,entity); if (keyValue != null) { } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EMP_PayrollMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EMP_PayrollMap.cs index 07e43fb08..8b747e607 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EMP_PayrollMap.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EMP_PayrollMap.cs @@ -18,7 +18,7 @@ namespace Learun.Application.Mapping //表 this.ToTable("EMP_PAYROLL"); //主键 - this.HasKey(t => t.dm); + this.HasKey(t => t.SalaryID); #endregion #region 配置关系 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/EMP_PayrollEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/EMP_PayrollEntity.cs index 849e432e8..cb03bb1c2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/EMP_PayrollEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/EMP_PayrollEntity.cs @@ -267,9 +267,9 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 编辑调用 /// /// - public void Modify( keyValue) + public void Modify( string keyValue) { - this. = keyValue; + this.SalaryID= keyValue; } #endregion #region 扩展字段 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目BLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目BLL.cs index 05195e208..ca0258bb0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目BLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目BLL.cs @@ -12,9 +12,9 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 日 期:2021-04-20 16:52 /// 描 述:工资条 /// - public class 工资项目BLL : 工资项目IBLL + public class EmpSalaryBLL : EMP_PayrollEntity { - private 工资项目Service 工资项目Service = new 工资项目Service(); + private EmpSalaryBLL Emp = new EmpSalaryBLL(); #region 获取数据 @@ -28,7 +28,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { try { - return 工资项目Service.GetPageList(pagination, queryJson); + return Emp.GetPageList(pagination, queryJson); } catch (Exception ex) { @@ -52,7 +52,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { try { - return 工资项目Service.GetEMP_PayrollEntity(keyValue); + return Emp.GetEMP_PayrollEntity(keyValue); } catch (Exception ex) { @@ -75,11 +75,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 删除实体数据 /// /// 主键 - public void DeleteEntity( keyValue) + public void DeleteEntity(string keyValue) { try { - 工资项目Service.DeleteEntity(keyValue); + Emp.DeleteEntity(keyValue); } catch (Exception ex) { @@ -100,11 +100,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 主键 /// 实体 /// - public void SaveEntity( keyValue, EMP_PayrollEntity entity) + public void SaveEntity( string keyValue, EMP_PayrollEntity entity) { try { - 工资项目Service.SaveEntity(keyValue, entity); + Emp.SaveEntity(keyValue, entity); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目IBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目IBLL.cs index 92f2123f1..b4b647c0e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目IBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目IBLL.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 日 期:2021-04-20 16:52 /// 描 述:工资条 /// - public interface 工资项目IBLL + public interface EmpSalaryIBLL { #region 获取数据 @@ -35,13 +35,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 删除实体数据 /// /// 主键 - void DeleteEntity( keyValue); + void DeleteEntity( string keyValue); /// /// 保存实体数据(新增、修改) /// /// 主键 /// 实体 - void SaveEntity( keyValue, EMP_PayrollEntity entity); + void SaveEntity(EmpSalaryBLL keyValue, EMP_PayrollEntity entity); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目Service.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目Service.cs index a52e2bf25..11b8a883a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目Service.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目Service.cs @@ -133,11 +133,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 删除实体数据 /// /// 主键 - public void DeleteEntity( keyValue) + public void DeleteEntity(string keyValue) { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.dm == keyValue); + this.BaseRepository("CollegeMIS").Delete(t=>t.SalaryID == keyValue); } catch (Exception ex) { @@ -157,7 +157,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// /// 主键 /// 实体 - public void SaveEntity( keyValue, EMP_PayrollEntity entity) + public void SaveEntity(string keyValue, EMP_PayrollEntity entity) { try {