|
@@ -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;
|
|
int user_cd_zt_num = 0;
|
|
|
|
+
|
|
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()
|