zhengcaioa.git - Gitblit

			@@ -116,7 +116,6 @@
			}



			[DllImport("Iphlpapi.dll")]
			private static extern int SendARP(Int32 dest, Int32 host, ref Int64 mac, ref Int32 length);

			@@ -418,7 +417,7 @@
			if ((int)StratTime.Date.DayOfWeek >= admAttendanceRuleDTO.WeekStart && (int)StratTime.Date.DayOfWeek <= admAttendanceRuleDTO.WeekEnd)
			{
			//是否节假日
			if (jiejiari.Exists(x => x.ValueStart <= StratTime.Date && x.ValueStart >= StratTime.Date))
			if (jiejiari.Exists(x => x.ValueStart <= StratTime.Date && x.ValueEnd >= StratTime.Date))
			{

			LavehTime += 0;
			@@ -467,7 +466,7 @@
			{

			//是否调休日调休日需要上班
			if (tiaoxiuri.Exists(x => x.ValueStart <= StratTime.Date && x.ValueStart >= StratTime.Date))
			if (tiaoxiuri.Exists(x => x.ValueStart <= StratTime.Date && x.ValueEnd >= StratTime.Date))
			{
			if (StratTime <= StratTimeWorkingStart)
			{
			@@ -513,7 +512,7 @@
			if ((int)EndTime.Date.DayOfWeek >= admAttendanceRuleDTO.WeekStart && (int)EndTime.Date.DayOfWeek <= admAttendanceRuleDTO.WeekEnd)
			{
			//是否节假日
			if (jiejiari.Exists(x => x.ValueStart <= EndTime.Date && x.ValueStart >= EndTime.Date))
			if (jiejiari.Exists(x => x.ValueStart <= EndTime.Date && x.ValueEnd >= EndTime.Date))
			{

			LavehTime += 0;
			@@ -563,7 +562,7 @@
			{

			//是否调休日调休日需要上班
			if (tiaoxiuri.Exists(x => x.ValueStart <= EndTime.Date && x.ValueStart >= EndTime.Date))
			if (tiaoxiuri.Exists(x => x.ValueStart <= EndTime.Date && x.ValueEnd >= EndTime.Date))
			{
			if (EndTime >= EndTimeOffworkEnd)
			{
			@@ -612,7 +611,7 @@
			if ((int)dateTimenow.Date.DayOfWeek >= admAttendanceRuleDTO.WeekStart && (int)dateTimenow.Date.DayOfWeek <= admAttendanceRuleDTO.WeekEnd)
			{
			//是否假期假期不上班
			if (jiejiari.Exists(x => x.ValueStart <= dateTimenow.Date && x.ValueStart >= dateTimenow.Date))
			if (jiejiari.Exists(x => x.ValueStart <= dateTimenow.Date && x.ValueEnd >= dateTimenow.Date))
			{
			LavehTime += 0;
			}
			@@ -625,7 +624,7 @@
			{

			//是否调休日调休日需要上班
			if (tiaoxiuri.Exists(x => x.ValueStart <= StratTime.Date && x.ValueStart >= StratTime.Date))
			if (tiaoxiuri.Exists(x => x.ValueStart <= StratTime.Date && x.ValueEnd >= StratTime.Date))
			{
			LavehTime += shangbanshijian;
			}
			@@ -638,8 +637,32 @@


			if(ts.Days == 0)
			{
			LavehTime -= shangbanshijian;
			{ //是否上班日期
			if ((int)StratTime.Date.DayOfWeek >= admAttendanceRuleDTO.WeekStart && (int)StratTime.Date.DayOfWeek <= admAttendanceRuleDTO.WeekEnd)
			{
			//是否节假日
			if (jiejiari.Exists(x => x.ValueStart <= StratTime.Date && x.ValueEnd >= StratTime.Date))
			{
			LavehTime -= 0;
			}
			else
			{
			LavehTime -= shangbanshijian;
			}
			}
			else
			{
			//是否调休日调休日需要上班
			if (tiaoxiuri.Exists(x => x.ValueStart <= StratTime.Date && x.ValueEnd >= StratTime.Date))
			{
			LavehTime -= shangbanshijian;
			}
			else
			{
			LavehTime -= 0;
			}
			}

			}

			}
			@@ -827,6 +850,8 @@
			ViewData["curentuser"] = curentuser;
			using (TransactionScope scope = new TransactionScope())
			{
			dto.FullAttendance = 0;
			dto.AbsenteeismPayment2 = 0;
			dto.RecStatus = "A";
			if (String.IsNullOrEmpty(dto.Id))
			{