计算工资 4.7

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -356,8 +356,8 @@ namespace OASystem.API.Controllers
 
             List<Pm_WageSheet> wageSheets1 = new List<Pm_WageSheet>();
             wageSheets1 = _result.Data;
-            #region 处理返回数据
 
+            #region 处理返回数据
 
             List<WageSheetInfoView> wageSheetItems = new List<WageSheetInfoView>();
             wageSheetItems = _mapper.Map<List<WageSheetInfoView>>(wageSheets1);

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

@@ -113,7 +113,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                              pm_WageSheet.Mealsupplement;
             //扣款合计
             decimal totalDeduction = pm_WageSheet.SickLeave + pm_WageSheet.SomethingFalse + pm_WageSheet.LateTo + pm_WageSheet.LeaveEarly + pm_WageSheet.Absenteeism + pm_WageSheet.NotPunch +
-                pm_WageSheet.OtherDeductions;
+                                     pm_WageSheet.ReservedFunds + pm_WageSheet.WithholdingInsurance + pm_WageSheet.OtherDeductions + pm_WageSheet.OtherDeductions;
 
             //实发合计 不含个税
             decimal actualTotal = salary - totalDeduction;