From 67d38d8bf05c36b20a15a39569ad9b1f94b384a4 Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Wed, 19 May 2021 16:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E6=80=A7=E5=B7=A5=E8=B5=84=E7=AE=A1=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Emp_PayrollOnceController.cs  |  7 ++----
 .../Views/Emp_PayrollOnce/Form.cshtml         | 12 ++++++---
 .../Views/Emp_PayrollOnce/Index.js            |  8 +++---
 .../Views/Emp_PayrollOnce/StatisticIndex.js   |  4 +--
 .../Emp_PayrollOnce/EMP_PayrollOnceEntity.cs  | 25 +++++++++++--------
 5 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollOnceController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollOnceController.cs
index e5b3ee28f..1c7eff821 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollOnceController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollOnceController.cs	
@@ -105,8 +105,8 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             {
                 IssueYear = x.Key.IssueYear,
                 IssueMonth = x.Key.IssueMonth,
-                SpringFestival = x.Select(y => y.SpringFestival.ToDecimal()).Sum().ToString(),
-                MidAutumnFestival = x.Select(y => y.MidAutumnFestival.ToDecimal()).Sum().ToString()
+                TotalPayAmount = x.Select(y => y.TotalPayAmount.ToDecimal()).Sum().ToString(),
+                FinalPayAmount = x.Select(y => y.FinalPayAmount.ToDecimal()).Sum().ToString()
             }).OrderByDescending(x => x.IssueYear).ThenByDescending(x => x.IssueMonth);
 
             return Success(datagroup);
@@ -140,9 +140,6 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             EMP_PayrollOnceEntity entity = strEntity.ToObject<EMP_PayrollOnceEntity>();
             emp_PayrollOnceIBLL.SaveEntity(keyValue, entity);
-            if (string.IsNullOrEmpty(keyValue))
-            {
-            }
             return Success("保存成功！");
         }
         #endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml
index 32dd2dfd7..a4ae88c9c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml	
@@ -16,12 +16,16 @@
         <input id="IssueYear" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
-        <div class="lr-form-item-title">春节福利</div>
-        <input id="SpringFestival" type="text" class="form-control" />
+        <div class="lr-form-item-title">应发金额</div>
+        <input id="TotalPayAmount" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
-        <div class="lr-form-item-title">中秋节福利</div>
-        <input id="MidAutumnFestival" type="text" class="form-control" />
+        <div class="lr-form-item-title">实发金额</div>
+        <input id="FinalPayAmount" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EMP_PayrollOnce">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:50px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js
index 092aeb3bd..59cb3bc07 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js	
@@ -91,13 +91,15 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/GetPageList',
                 headData: [
                     { label: "姓名", name: "SalaryName", width: 100, align: "left" },
-                    { label: "春节福利", name: "SpringFestival", width: 100, align: "left", statistics: true },
-                    { label: "中秋节福利", name: "MidAutumnFestival", width: 100, align: "left", statistics: true },
+                    { label: "应发金额", name: "TotalPayAmount", width: 100, align: "left", statistics: true },
+                    { label: "实发金额", name: "FinalPayAmount", width: 100, align: "left", statistics: true },
                     { label: "发放月份", name: "IssueMonth", width: 100, align: "left" },
                     { label: "发放年份", name: "IssueYear", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
                 ],
                 mainId: 'SalaryID',
-                isPage: true
+                isPage: true,
+                sidx: 'IssueYear desc,IssueMonth desc'
             });
             page.search();
         },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js
index d08462485..9b926e1a2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js	
@@ -47,8 +47,8 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "发放年份", name: "IssueYear", width: 100, align: "left" },
                     { label: "发放月份", name: "IssueMonth", width: 100, align: "left" },
-                    { label: "春节福利", name: "SpringFestival", width: 100, align: "left", statistics: true },
-                    { label: "中秋节福利", name: "MidAutumnFestival", width: 100, align: "left", statistics: true },
+                    { label: "应发金额", name: "TotalPayAmount", width: 100, align: "left", statistics: true },
+                    { label: "实发金额", name: "FinalPayAmount", width: 100, align: "left", statistics: true },
                 ],
                 mainId: 'SalaryID',
                 isPage: false
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs
index fe1090873..ceebc772c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs	
@@ -16,35 +16,40 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
     {
         #region 实体成员
         /// <summary>
-        /// SalaryID
+        /// 工资编号
         /// </summary>
         [Column("SALARYID")]
         public string SalaryID { get; set; }
         /// <summary>
-        /// SalaryName
+        /// 姓名
         /// </summary>
         [Column("SALARYNAME")]
         public string SalaryName { get; set; }
         /// <summary>
-        /// IssueMonth
+        /// 发放月份
         /// </summary>
         [Column("ISSUEMONTH")]
         public string IssueMonth { get; set; }
         /// <summary>
-        /// IssueYear
+        /// 发放年份
         /// </summary>
         [Column("ISSUEYEAR")]
         public string IssueYear { get; set; }
         /// <summary>
-        /// SpringFestival
+        /// 应发金额
         /// </summary>
-        [Column("SPRINGFESTIVAL")]
-        public string SpringFestival { get; set; }
+        [Column("TOTALPAYAMOUNT")]
+        public string TotalPayAmount { get; set; }
         /// <summary>
-        /// MidAutumnFestival
+        /// 实发金额
         /// </summary>
-        [Column("MIDAUTUMNFESTIVAL")]
-        public string MidAutumnFestival { get; set; }
+        [Column("FINALPAYAMOUNT")]
+        public string FinalPayAmount { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
 
         #endregion