计算工资 增加特殊日期-不用打卡日期信息 1

OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -101,6 +101,8 @@ namespace OASystem.API.OAMethodLib
             workday_userRoots = workday_userRoots.OrderBy(it => it.base_info.date).ToList();
 
 
+            #region 特殊日期-不用打卡日期信息
+
             //获取企业打卡规则
             CorpCheckInRuleView corpCheckInRole = await _qiYeWeChatApiService.GetCheckIn_CorpCheckInOptionAsync();
             if (corpCheckInRole.errcode != 0)
@@ -120,16 +122,16 @@ namespace OASystem.API.OAMethodLib
                     if (item.begtime_dt>= startDt && item.endtime_dt <= endDt)
                     {
                         TimeSpan ts = item.endtime_dt - item.begtime_dt;
-                        spe_offdays += ts.Days;
+                        spe_offdays += (ts.Days + 1);
                     }
                 }
             }
+            #endregion
 
 
 
-
-                //获取 请假类型 Sp_Detail.template_id
-                string leave_template_id = "C4NzTJCh1onCUK915rRkvy7Fh5Vqz4YbiEV9jrBY1";
+            //获取 请假类型 Sp_Detail.template_id
+            string leave_template_id = "C4NzTJCh1onCUK915rRkvy7Fh5Vqz4YbiEV9jrBY1";
             List<VacationLeaveTypeView> vacationLeaveTypes = await GetVacationLeaveTypes(leave_template_id);
             if (vacationLeaveTypes.Count <= 0)
             {
@@ -1384,8 +1386,6 @@ namespace OASystem.API.OAMethodLib
                         }
                         else
                         {
-                            
-
                             salaryTotal = (workDays * dailyWage) + mealTotal + pm_wsInfo.OtherHandle;    //应发合计
                         }
                             
@@ -1405,7 +1405,6 @@ namespace OASystem.API.OAMethodLib
                     pm_wsInfo.EndDate = endDt.ToString("yyyy-MM-dd");
                     pm_wsInfo.WorkDays = work_days;        //当月应出勤天数
                     pm_wsInfo.RegularDays = workDays;  //当月正常出勤天数
-
                     pm_wsInfo.SickLeave = sickLeaveTotal;           //病假
                     pm_wsInfo.SomethingFalse = personalLeaveTotal;  //事假
                     pm_wsInfo.LateTo = beLate_deduction;            //迟到