计算工资 5.2

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -96,14 +96,6 @@ namespace OASystem.API.Controllers
 
             //获取月工资数据
             string yearMonth = yearMonthDt.ToString("yyyy-MM");
-            string startDt = yearMonthDt.AddDays(-1).ToString("yyyy-MM") + "-28",
-                   endDt = yearMonth + "-27";
-
-            //应发合计 = 基本工资 +绩效工资 + 岗位津贴 + 保密费 + 其他补贴  + 餐补
-
-            //事假  病假 合计
-
-            //扣款合计 = 迟到 + 早退 + 矿工 + 未打卡 + 其他扣款 
 
             if (dto.PortType == 1)
             {

OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -620,6 +620,8 @@ namespace OASystem.API.OAMethodLib
                 pm_wsInfo.YearMonth = thisYearMonth;
                 pm_wsInfo.StartDate = startDt.ToString("yyyy-MM-dd");
                 pm_wsInfo.EndDate = endDt.ToString("yyyy-MM-dd");
+                pm_wsInfo.WorkDays = work_days;        //当月应出勤天数
+                pm_wsInfo.RegularDays = regular_days;  //当月正常出勤天数
 
                 pm_wsInfo.SickLeave = sickLeaveTotal;           //病假
                 pm_wsInfo.SomethingFalse = personalLeaveTotal;  //事假

OASystem/OASystem.Domain/Entities/PersonnelModule/Pm_WageSheet.cs

@@ -37,6 +37,18 @@ namespace OASystem.Domain.Entities.PersonnelModule
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string? EndDate { get; set; }
 
+        /// <summary>
+        /// 当月应出勤天数
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int WorkDays { get; set; }
+
+        /// <summary>
+        /// 正常出勤天数
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int RegularDays { get; set; }
+
         /// <summary>
         /// 基本工资
         /// </summary>

OASystem/OASystem.Domain/ViewModels/PersonnelModule/WageSheetView.cs

@@ -48,6 +48,17 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         /// </summary>
         public string? EndDate { get; set; }
 
+        /// <summary>
+        /// 应出勤天数
+        /// </summary>
+        public int WorkDays { get; set; }
+
+        /// <summary>
+        /// 正常出勤天数
+        /// </summary>
+        public int RegularDays { get; set; }
+
+
         /// <summary>
         /// 基本工资
         /// </summary>
@@ -199,6 +210,16 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         /// </summary>
         public string? EndDate { get; set; }
 
+        /// <summary>
+        /// 应出勤天数
+        /// </summary>
+        public int WorkDays { get; set; }
+
+        /// <summary>
+        /// 正常出勤天数
+        /// </summary>
+        public int RegularDays { get; set; }
+
         /// <summary>
         /// 员工Id
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/PersonnelModule/WageSheetRepository.cs

@@ -40,13 +40,13 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 return _result;
             }
 
-            string sql = string.Format(@"Select sys_u1.CnName Name,sys_u2.CnName LastUpdateUserName,pm_ws.LastUpdateDt, pm_ws.Id, 
-                                         pm_ws.YearMonth,pm_ws.StartDate,pm_ws.EndDate,pm_ws.UserId,pm_ws.Should,
-                                         pm_ws.TotalDeductions,pm_ws.Ex_ItemsRemark,TotalRealHair,pm_ws.WithholdingTax,pm_ws.AfterTax
+            string sql = string.Format(@"Select sys_u1.CnName Name,sys_u2.CnName LastUpdateUserName,pm_ws.LastUpdateDt, pm_ws.Id,pm_ws.YearMonth,pm_ws.StartDate,
+										 pm_ws.EndDate,pm_ws.WorkDays,pm_ws.RegularDays,pm_ws.UserId,pm_ws.Should,pm_ws.TotalDeductions,
+										 pm_ws.Ex_ItemsRemark,TotalRealHair,pm_ws.WithholdingTax,pm_ws.AfterTax
                                          From Pm_WageSheet pm_ws
                                          Left Join Sys_Users sys_u1 On pm_ws.UserId = sys_u1.Id
                                          Left Join Sys_Users sys_u2 On pm_ws.LastUpdateUserId = sys_u2.Id
-                                         Where pm_ws.IsDel = 0 And pm_ws.YearMonth = '{0}'", yearMonth);
+                                         Where pm_ws.IsDel = 0 And pm_ws.YearMonth =  '{0}'", yearMonth);
             var wageSheetList = await _sqlSugar.SqlQueryable<WageSheetItemInfoView>(sql).ToListAsync();
 
             if (wageSheetList.Count <= 0 )