计算工资 5.11

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -146,7 +146,6 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(true, _result.Msg, _result.Data));
         }
 
-
         /// <summary>
         /// 人事模块 工资表单 删除
         /// </summary>

OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -111,8 +111,8 @@ namespace OASystem.API.OAMethodLib
                     Summary_Info? summary_Info = checkInData.summary_info;
                     if (summary_Info == null) { continue; }
 
-                    int work_days = summary_Info.work_days;   //应出勤天数
-                    int regular_days = summary_Info.regular_days;  //正常出勤天数
+                    int work_days = summary_Info.work_days -1;   //应出勤天数 
+                    int regular_days = summary_Info.regular_days - 1;  //正常出勤天数
 
                     meal_subsidy = work_days * 10; //应发放餐补
 
@@ -633,7 +633,7 @@ namespace OASystem.API.OAMethodLib
                     #region 处理当月工资数据
                     pm_wsInfo.YearMonth = thisYearMonth;
                     pm_wsInfo.StartDate = startDt.ToString("yyyy-MM-dd");
-                    pm_wsInfo.EndDate = endDt.ToString("yyyy-MM-dd");
+                    pm_wsInfo.EndDate = endDt.AddDays(-1).ToString("yyyy-MM-dd");
                     pm_wsInfo.WorkDays = work_days;        //当月应出勤天数
                     pm_wsInfo.RegularDays = regular_days;  //当月正常出勤天数
 

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

@@ -190,6 +190,21 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
 
     public class WageSheetItemInfoView
     {
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int Row_Number { get; set; }
+
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string? CompanyName { get; set; }
+
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string? DepName { get; set; }
+
         /// <summary>
         /// 
         /// </summary>

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

@@ -40,13 +40,24 @@ 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.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);
+            //不含公司部门
+            // 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);
+
+            //公司部门
+            string sql = string.Format(@"Select row_number() over(order by pm_ws.Id) as Row_Number,
+                                	sc.CompanyName,sd.DepName, sys_u1.CnName Name,sys_u2.CnName LastUpdateUserName,pm_ws.* 
+                                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
+                                Left Join Sys_Company sc On  sys_u1.companyId = sc.Id
+                                Left Join Sys_Department sd On sys_u1.DepId = sd.Id
+                                Where pm_ws.IsDel = 0 And pm_ws.YearMonth = '{0}'", yearMonth);
             var wageSheetList = await _sqlSugar.SqlQueryable<WageSheetItemInfoView>(sql).ToListAsync();
 
             if (wageSheetList.Count <= 0 )