Browse Source

计算工资 调整decimal

leiy 1 year ago
parent
commit
d2cc7337a5

+ 0 - 1
OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -170,7 +170,6 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(false, "操作失败!"));
             return Ok(JsonView(false, "操作失败!"));
         }
         }
 
 
-
         /// <summary>
         /// <summary>
         /// 工资表单 基础数据源
         /// 工资表单 基础数据源
         /// </summary>
         /// </summary>

+ 6 - 1
OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -89,7 +89,6 @@ namespace OASystem.API.OAMethodLib
 
 
             //查询工作日
             //查询工作日
             List<Sys_Calendar> sys_Calendars = new List<Sys_Calendar>();
             List<Sys_Calendar> sys_Calendars = new List<Sys_Calendar>();
-
             string sys_sql = string.Format("Select * From Sys_Calendar Where Isdel = 0 And Dt between '{0}' And '{1}'", 
             string sys_sql = string.Format("Select * From Sys_Calendar Where Isdel = 0 And Dt between '{0}' And '{1}'", 
                 startDt.ToString("yyyy-MM-dd"), endDt.ToString("yyyy-MM-dd"));
                 startDt.ToString("yyyy-MM-dd"), endDt.ToString("yyyy-MM-dd"));
             sys_Calendars = await _usersRep._sqlSugar.SqlQueryable<Sys_Calendar>(sys_sql).ToListAsync();
             sys_Calendars = await _usersRep._sqlSugar.SqlQueryable<Sys_Calendar>(sys_sql).ToListAsync();
@@ -208,6 +207,7 @@ namespace OASystem.API.OAMethodLib
                         #region 迟到 早退 旷工
                         #region 迟到 早退 旷工
 
 
                         int user_cd_zt_num = 0; //早退/迟到 次数 10分钟内 2次以内不记处罚 三次及以上50一次
                         int user_cd_zt_num = 0; //早退/迟到 次数 10分钟内 2次以内不记处罚 三次及以上50一次
+
                         foreach (var root in userRoots)
                         foreach (var root in userRoots)
                         {
                         {
                             List<Holiday_infos> holiday_Infos = root.holiday_infos; //当天假勤信息
                             List<Holiday_infos> holiday_Infos = root.holiday_infos; //当天假勤信息
@@ -462,7 +462,12 @@ namespace OASystem.API.OAMethodLib
                                 }
                                 }
                             }
                             }
 
 
+                            if (timelength < 1)
+                            {
+                                continue;
+                            }
 
 
+                            timelength = ConvertToDecimal(timelength);
                             decimal day_deduction = 0.00M;
                             decimal day_deduction = 0.00M;
 
 
                             Ex_Item beLate_belate_ex = new Ex_Item()
                             Ex_Item beLate_belate_ex = new Ex_Item()