gz

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/工资项目Controller.cs → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollController.cs

@@ -10,12 +10,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-04-20 16:52
-    /// 描 述：工资条
+    /// 日 期：2021-04-21 15:42
+    /// 描 述：考勤记录
     /// </summary>
-    public class EmpPayrollController : MvcControllerBase
+    public class Emp_PayrollController : MvcControllerBase
     {
-        private SalarySheetIBLL Emps = new SalarySheetBLL();
+        private Emp_PayrollIBLL emp_PayrollIBLL = new Emp_PayrollBLL();
 
         #region 视图功能
 
@@ -52,7 +52,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult GetPageList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = Emps.GetPageList(paginationobj, queryJson);
+            var data = emp_PayrollIBLL.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 = Emps.GetSalarySheetEntity( keyValue );
+            var EMP_PayrollData = emp_PayrollIBLL.GetEMP_PayrollEntity( keyValue );
             var jsonData = new {
                 EMP_Payroll = EMP_PayrollData,
             };
@@ -88,9 +88,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         /// <returns></returns>
         [HttpPost]
         [AjaxOnly]
-        public ActionResult DeleteForm( string keyValue)
+        public ActionResult DeleteForm(string keyValue)
         {
-            Emps.DeleteEntity(keyValue);
+            emp_PayrollIBLL.DeleteEntity(keyValue);
             return Success("删除成功！");
         }
         /// <summary>
@@ -104,9 +104,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
-            SalarySheetEntity entity = strEntity.ToObject<SalarySheetEntity>();
-            Emps.SaveEntity(keyValue,entity);
-            if (keyValue != null)
+            EMP_PayrollEntity entity = strEntity.ToObject<EMP_PayrollEntity>();
+            emp_PayrollIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
             {
             }
             return Success("保存成功！");

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Form.cshtml → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.cshtml

@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = "工资条";
+    ViewBag.Title = "考勤记录";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
@@ -44,7 +44,7 @@
         <input id="MeritPayLess" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
-        <div class="lr-form-item-title">月一次性发放绩效</div>
+        <div class="lr-form-item-title">月发一次性绩效</div>
         <input id="MonthlyoneMerit" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
@@ -87,6 +87,10 @@
         <div class="lr-form-item-title">加班费</div>
         <input id="OvertimePay" type="text" class="form-control"  />
     </div>
+    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+        <div class="lr-form-item-title">值班费</div>
+        <input id="OnDutyfee" type="text" class="form-control"  />
+    </div>
     <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
         <div class="lr-form-item-title">考务费</div>
         <input id="ExaminationFee" type="text" class="form-control"  />
@@ -128,7 +132,7 @@
         <input id="Replacement" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
-        <div class="lr-form-item-title">应计合法</div>
+        <div class="lr-form-item-title">应发合计</div>
         <input id="SendSum" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
@@ -164,7 +168,7 @@
         <input id="AssDeductions" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
-        <div class="lr-form-item-title">其他代扣</div>
+        <div class="lr-form-item-title">其他扣款</div>
         <input id="OtherDeductions" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
@@ -184,7 +188,7 @@
         <input id="TaxIncome" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
-        <div class="lr-form-item-title">实发合计</div>
+        <div class="lr-form-item-title">应发合计</div>
         <input id="NetCombined" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
@@ -192,4 +196,4 @@
         <input id="IssueMonth" type="text" class="form-control"  />
     </div>
 </div>
-@Html.AppendJsFile("/Areas/PersonnelManagement/Views/工资项目/Form.js")
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Form.js → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js

@@ -1,8 +1,8 @@
 /* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
- * 日  期：2021-04-20 16:52
- * 描  述：工资条
+ * 日  期：2021-04-21 15:42
+ * 描  述：考勤记录
  */
 var acceptClick;
 var keyValue = request('keyValue');
@@ -18,7 +18,7 @@ var bootstrap = function ($, learun) {
         },
         initData: function () {
             if (!!keyValue) {
-                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/工资项目/GetFormData?keyValue=' + keyValue, function (data) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
                             $('#' + id ).jfGridSet('refreshdata', data[id]);
@@ -39,7 +39,7 @@ var bootstrap = function ($, learun) {
         var postData = {
             strEntity: JSON.stringify($('body').lrGetFormData())
         };
-        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/工资项目/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Index.cshtml → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Index.cshtml

@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = "工资条";
+    ViewBag.Title = "考勤记录";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
 <div class="lr-layout "  >
@@ -24,4 +24,4 @@
         </div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/PersonnelManagement/Views/工资项目/Index.js")
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_Payroll/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Index.js → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Index.js

@@ -1,8 +1,8 @@
 /* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
- * 日  期：2021-04-20 16:52
- * 描  述：工资条
+ * 日  期：2021-04-21 15:42
+ * 描  述：考勤记录
  */
 var refreshGirdData;
 var bootstrap = function ($, learun) {
@@ -22,7 +22,7 @@ var bootstrap = function ($, learun) {
                 learun.layerForm({
                     id: 'form',
                     title: '新增',
-                    url: top.$.rootUrl + '/PersonnelManagement/工资项目/Form',
+                    url: top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/Form',
                     width: 600,
                     height: 400,
                     callBack: function (id) {
@@ -32,12 +32,12 @@ var bootstrap = function ($, learun) {
             });
             // 编辑
             $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('dm');
+                var keyValue = $('#gridtable').jfGridValue('SalaryID');
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/PersonnelManagement/工资项目/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/Form?keyValue=' + keyValue,
                         width: 600,
                         height: 400,
                         callBack: function (id) {
@@ -48,11 +48,11 @@ var bootstrap = function ($, learun) {
             });
             // 删除
             $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('dm');
+                var keyValue = $('#gridtable').jfGridValue('SalaryID');
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/工资项目/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/DeleteForm', { keyValue: keyValue}, function () {
                                 refreshGirdData();
                             });
                         }
@@ -66,8 +66,8 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/PersonnelManagement/工资项目/GetPageList',
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/GetPageList',
                 headData: [
                     { label: "姓名", name: "SalaryName", width: 100, align: "left"},
                     { label: "岗位工资", name: "PostSalary", width: 100, align: "left"},
@@ -79,7 +79,7 @@ var bootstrap = function ($, learun) {
                     { label: "级差补贴", name: "DifferentialSub", width: 100, align: "left"},
                     { label: "绩效工资", name: "MeritPay", width: 100, align: "left"},
                     { label: "绩效工资减少额", name: "MeritPayLess", width: 100, align: "left"},
-                    { label: "月一次性发放绩效", name: "MonthlyoneMerit", width: 100, align: "left"},
+                    { label: "月发一次性绩效", name: "MonthlyoneMerit", width: 100, align: "left"},
                     { label: "倾斜", name: "Tilt", width: 100, align: "left"},
                     { label: "课时费", name: "Classfees", width: 100, align: "left"},
                     { label: "超课时", name: "SuperClass", width: 100, align: "left"},
@@ -90,6 +90,7 @@ var bootstrap = function ($, learun) {
                     { label: "骨干津贴", name: "KeyBenefits", width: 100, align: "left"},
                     { label: "职务补", name: "PositionFill", width: 100, align: "left"},
                     { label: "加班费", name: "OvertimePay", width: 100, align: "left"},
+                    { label: "值班费", name: "OnDutyfee", width: 100, align: "left"},
                     { label: "考务费", name: "ExaminationFee", width: 100, align: "left"},
                     { label: "安全绩效", name: "SecurityPay", width: 100, align: "left"},
                     { label: "医药费", name: "MedicalBills", width: 100, align: "left"},
@@ -100,7 +101,7 @@ var bootstrap = function ($, learun) {
                     { label: "综合补助", name: "ComprehensiveSub", width: 100, align: "left"},
                     { label: "综治奖", name: "ControlSub", width: 100, align: "left"},
                     { label: "补发", name: "Replacement", width: 100, align: "left"},
-                    { label: "应计合法", name: "SendSum", width: 100, align: "left"},
+                    { label: "应发合计", name: "SendSum", width: 100, align: "left"},
                     { label: "失保", name: "LossInsurance", width: 100, align: "left"},
                     { label: "养保", name: "Bartender", width: 100, align: "left"},
                     { label: "职业年金", name: "OcPension", width: 100, align: "left"},
@@ -109,15 +110,15 @@ var bootstrap = function ($, learun) {
                     { label: "房租", name: "TheRent", width: 100, align: "left"},
                     { label: "网费", name: "InternetFee", width: 100, align: "left"},
                     { label: "考核扣款", name: "AssDeductions", width: 100, align: "left"},
-                    { label: "其他代扣", name: "OtherDeductions", width: 100, align: "left"},
+                    { label: "其他扣款", name: "OtherDeductions", width: 100, align: "left"},
                     { label: "代扣个税", name: "WithBuckletax", width: 100, align: "left"},
                     { label: "扣款合计", name: "DeductionsSum", width: 100, align: "left"},
                     { label: "纳税收入", name: "TaxRevenue", width: 100, align: "left"},
                     { label: "免税收入", name: "TaxIncome", width: 100, align: "left"},
-                    { label: "实发合计", name: "NetCombined", width: 100, align: "left"},
+                    { label: "应发合计", name: "NetCombined", width: 100, align: "left"},
                     { label: "发放月份", name: "IssueMonth", width: 100, align: "left"},
                 ],
-                mainId:'dm',
+                mainId:'SalaryID',
                 isPage: true
             });
             page.search();

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

@@ -793,7 +793,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuLeaveManagementController.cs" />
     <Compile Include="Areas\Permission\Controllers\DepartmentReleasePermissionsController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\EATalentTrainController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\工资项目Controller.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\Emp_PayrollController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6132,10 +6132,10 @@
     <Content Include="Areas\EducationalAdministration\Views\EATalentTrain\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\EATalentTrain\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\EATalentTrain\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\工资项目\Index.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\工资项目\Index.js" />
-    <Content Include="Areas\PersonnelManagement\Views\工资项目\Form.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\工资项目\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\Emp_Payroll\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\Emp_Payroll\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\Emp_Payroll\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\Emp_Payroll\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\LR_Desktop\Models\" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EMP_PayrollMap.cs

@@ -7,8 +7,8 @@ namespace  Learun.Application.Mapping
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-04-20 16:52
-    /// 描 述：工资条
+    /// 日 期：2021-04-21 15:42
+    /// 描 述：考勤记录
     /// </summary>
     public class EMP_PayrollMap : EntityTypeConfiguration<EMP_PayrollEntity>
     {

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

@@ -1601,10 +1601,10 @@
     <Compile Include="EducationalAdministration\EATalentTrain\EATalentTrainService.cs" />
     <Compile Include="EducationalAdministration\EATalentTrain\EATalentTrainBLL.cs" />
     <Compile Include="EducationalAdministration\EATalentTrain\EATalentTrainIBLL.cs" />
-    <Compile Include="PersonnelManagement\工资项目\EMP_PayrollEntity.cs" />
-    <Compile Include="PersonnelManagement\工资项目\工资项目Service.cs" />
-    <Compile Include="PersonnelManagement\工资项目\工资项目BLL.cs" />
-    <Compile Include="PersonnelManagement\工资项目\工资项目IBLL.cs" />
+    <Compile Include="PersonnelManagement\Emp_Payroll\EMP_PayrollEntity.cs" />
+    <Compile Include="PersonnelManagement\Emp_Payroll\Emp_PayrollService.cs" />
+    <Compile Include="PersonnelManagement\Emp_Payroll\Emp_PayrollBLL.cs" />
+    <Compile Include="PersonnelManagement\Emp_Payroll\Emp_PayrollIBLL.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/PersonnelManagement/工资项目/EMP_PayrollEntity.cs → Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/EMP_PayrollEntity.cs

@@ -8,8 +8,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-04-20 16:52
-    /// 描 述：工资条
+    /// 日 期：2021-04-21 15:42
+    /// 描 述：考勤记录
     /// </summary>
     public class EMP_PayrollEntity 
     {
@@ -254,6 +254,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("ISSUEMONTH")]
         public string IssueMonth { get; set; }
+        /// <summary>
+        /// OnDutyfee
+        /// </summary>
+        [Column("ONDUTYFEE")]
+        public string OnDutyfee { get; set; }
         #endregion
 
         #region 扩展操作
@@ -262,14 +267,15 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         public void Create()
         {
+            this.SalaryID = Guid.NewGuid().ToString();
         }
         /// <summary>
         /// 编辑调用
         /// </summary>
         /// <param name="keyValue"></param>
-        public void Modify( string keyValue)
+        public void Modify(string keyValue)
         {
-            this.SalaryID= keyValue;
+            this.SalaryID = keyValue;
         }
         #endregion
         #region 扩展字段

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目BLL.cs → Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollBLL.cs

@@ -9,12 +9,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-04-20 16:52
-    /// 描 述：工资条
+    /// 日 期：2021-04-21 15:42
+    /// 描 述：考勤记录
     /// </summary>
-    public class EmpSalaryBLL : EMP_PayrollEntity
+    public class Emp_PayrollBLL : Emp_PayrollIBLL
     {
-        private EmpSalaryBLL Emp = new EmpSalaryBLL();
+        private Emp_PayrollService emp_PayrollService = new Emp_PayrollService();
 
         #region 获取数据
 
@@ -28,7 +28,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                return Emp.GetPageList(pagination, queryJson);
+                return emp_PayrollService.GetPageList(pagination, queryJson);
             }
             catch (Exception ex)
             {
@@ -52,7 +52,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                return Emp.GetEMP_PayrollEntity(keyValue);
+                return emp_PayrollService.GetEMP_PayrollEntity(keyValue);
             }
             catch (Exception ex)
             {
@@ -79,7 +79,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                Emp.DeleteEntity(keyValue);
+                emp_PayrollService.DeleteEntity(keyValue);
             }
             catch (Exception ex)
             {
@@ -100,11 +100,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity( string keyValue, EMP_PayrollEntity entity)
+        public void SaveEntity(string keyValue, EMP_PayrollEntity entity)
         {
             try
             {
-                Emp.SaveEntity(keyValue, entity);
+                emp_PayrollService.SaveEntity(keyValue, entity);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目IBLL.cs → Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollIBLL.cs

@@ -8,10 +8,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-04-20 16:52
-    /// 描 述：工资条
+    /// 日 期：2021-04-21 15:42
+    /// 描 述：考勤记录
     /// </summary>
-    public interface EmpSalaryIBLL
+    public interface Emp_PayrollIBLL
     {
         #region 获取数据
 
@@ -35,13 +35,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// 删除实体数据
         /// </summary>
         /// <param name="keyValue">主键</param>
-        void DeleteEntity( string keyValue);
+        void DeleteEntity(string keyValue);
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(EmpSalaryBLL keyValue, EMP_PayrollEntity entity);
+        void SaveEntity(string keyValue, EMP_PayrollEntity entity);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/工资项目/工资项目Service.cs → Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollService.cs

@@ -12,10 +12,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-04-20 16:52
-    /// 描 述：工资条
+    /// 日 期：2021-04-21 15:42
+    /// 描 述：考勤记录
     /// </summary>
-    public class 工资项目Service : RepositoryFactory
+    public class Emp_PayrollService : RepositoryFactory
     {
         #region 获取数据
 
@@ -32,7 +32,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(@"
-                t.dm,
+                t.SalaryID,
                 t.SalaryName,
                 t.PostSalary,
                 t.PayWages,
@@ -54,6 +54,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 t.KeyBenefits,
                 t.PositionFill,
                 t.OvertimePay,
+                t.OnDutyfee,
                 t.ExaminationFee,
                 t.SecurityPay,
                 t.MedicalBills,
@@ -110,7 +111,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<EMP_PayrollEntity>(keyValue.ToInt());
+                return this.BaseRepository("CollegeMIS").FindEntity<EMP_PayrollEntity>(keyValue);
             }
             catch (Exception ex)
             {
@@ -161,7 +162,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                if (keyValue != null)
+                if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
                     this.BaseRepository("CollegeMIS").Update(entity);