计算工资 5.17

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -215,11 +215,20 @@ namespace OASystem.API.Controllers
                 if (pm_WageSheet.RegularDays >= pm_WageSheet.WorkDays )
                 {
                     pm_WageSheet.RegularDays = pm_WageSheet.WorkDays;
-                    salary = salary = salary + pm_WageSheet.Mealsupplement;
+                    salary = salary + pm_WageSheet.Mealsupplement;
                 }
                 else
                 {
-                    salary = salary = (PayrollComputation.ConvertToDecimal(salary / pm_WageSheet.WorkDays) * pm_WageSheet.RegularDays) + pm_WageSheet.Mealsupplement;
+                    if (dto.UserId == 21) //21==张海麟
+                    {
+                        salary = salary + pm_WageSheet.Mealsupplement;
+                    }
+                    else
+                    {
+                        salary = salary = (PayrollComputation.ConvertToDecimal(salary / pm_WageSheet.WorkDays) * pm_WageSheet.RegularDays) + pm_WageSheet.Mealsupplement;
+                    }     
+
+                    
                 }
 
                 
@@ -279,7 +288,7 @@ namespace OASystem.API.Controllers
 
             //计算本月工资起止时间 比如是2月的1号-28号，那就是2月1号的零点到3月1号的零点 
             DateTime thisStartDt = startDt;
-            DateTime thisEndDt = endDt; //
+            DateTime thisEndDt = endDt.AddDays(1); //
 
             //本月工资是否有数据 有数据则不计算
             result = await _wageSheetRep.Get_WageSheet_ListByYearMonthAsync(thisYearMonth);

OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -137,7 +137,7 @@ namespace OASystem.API.OAMethodLib
 
                     #endregion
 
-                    if (itemName != "张海麟") //不算考勤
+                    if (!itemName.Equals("张海麟")) //不算考勤
                     {
                         int annualLeaveNum = 0,    //年假
                             personalLeaveNum = 0,  //事假
@@ -247,7 +247,7 @@ namespace OASystem.API.OAMethodLib
                                     decimal leave_meals = 0.00M;
 
                                     //计算餐补 假勤类型扣款
-                                    CalculateTypeFee(leaveType, date_Range.type, startTime, endTime, amountPayable, work_days, new_duration,
+                                    CalculateTypeFee(leaveType, date_Range.type, leave_starttime, leave_endtime, amountPayable, work_days, new_duration,
                                         out leave_meals, out thisTypeDeduction);
 
                                     #region 累计类型扣款
@@ -647,7 +647,15 @@ namespace OASystem.API.OAMethodLib
                     }
                     else
                     {
-                        salaryTotal = (dk_work_days * dailyWage) + mealTotal;    //应发合计
+                        
+                        if (itemName.Equals("张海麟"))
+                        {
+                            salaryTotal = amountPayable + mealTotal;
+                        }
+                        else
+                        {
+                            salaryTotal = (dk_work_days * dailyWage) + mealTotal;    //应发合计
+                        }
                     }
                      
 

OASystem/OASystem.Domain/Dtos/PersonnelModule/WageSheetDto.cs

@@ -123,7 +123,7 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// </summary>
         public decimal ReservedFunds { get; set; }
 
-        /// <summary>
        /// 代扣公积金
        /// </summary>                                     
        public decimal WithholdingTax { get; set; }
+        /// <summary>
        /// 代扣个税
        /// </summary>                                     
        public decimal WithholdingTax { get; set; }
 
         /// <summary>
         /// 病假