diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/images/dkred.png b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/images/dkred.png new file mode 100644 index 000000000..a2dc327d0 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/images/dkred.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AttendanceCard/AttendanceCard.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AttendanceCard/AttendanceCard.html index fba1ada80..1cfbce9e4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AttendanceCard/AttendanceCard.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AttendanceCard/AttendanceCard.html @@ -7,7 +7,7 @@ 打卡 --> - +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AttendanceCard/AttendanceCard.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AttendanceCard/AttendanceCard.js index 294c1d155..d9d2f147c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AttendanceCard/AttendanceCard.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AttendanceCard/AttendanceCard.js @@ -11,7 +11,7 @@ if (data.data == true) { $('#attimg').attr('src', 'images/dk.png'); } else { - $('#attimg').attr('src', 'images/2.jpg'); + $('#attimg').attr('src', 'images/dkred.png'); } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleBLL.cs index 2c3889e69..dd00880e1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleBLL.cs @@ -147,7 +147,7 @@ namespace Learun.Application.Base.SystemModule node.value = item.F_EnCode; node.showcheck = true; node.checkstate = 0; - node.isexpand = true; + node.isexpand = false;//true; node.icon = item.F_Icon; node.parentId = item.F_ParentId; treeList.Add(node); @@ -346,7 +346,7 @@ namespace Learun.Application.Base.SystemModule node.value = module.F_EnCode; node.showcheck = true; node.checkstate = 0; - node.isexpand = true; + node.isexpand = false; //true; node.icon = module.F_Icon; node.parentId = module.F_ParentId + "_learun_moduleId"; if (module.F_Target != "expand") @@ -462,7 +462,7 @@ namespace Learun.Application.Base.SystemModule node.value = module.F_EnCode; node.showcheck = true; node.checkstate = 0; - node.isexpand = true; + node.isexpand = false;// true; node.icon = module.F_Icon; node.parentId = module.F_ParentId + "_learun_moduleId"; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs index 18a80042d..b15f9484f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs @@ -1083,7 +1083,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement string strTimeYear = (datetimenow.Year).ToString(); string strTimeMonth = (datetimenow.Month).ToString("d2"); string strTimeDay = (datetimenow.Day).ToString("d2"); - //该用户当日有签到记录视为下班签退 + //该用户当日签到记录 var attendancerecordList = this.BaseRepository("CollegeMIS").FindList( "select * from ADR_Record where ADYear='" + strTimeYear + "' and ADMonth='" + strTimeMonth + "' and ADDay='" + strTimeDay + "' and UserNo='" + EmpNo + "'").ToList(); @@ -1113,34 +1113,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { //中午下班时间 DateTime offworkDateTimelunch = Convert.ToDateTime(datenow + " " + attendancerulEntity.NoonCloseTime); - //中午上班时间 - DateTime workDateTimelunch = Convert.ToDateTime(datenow + " " + attendancerulEntity.NoonWorkTime); //中午下班考勤时间段 DateTime offworkstartlunch = Convert.ToDateTime(datenow + " " + attendancerulEntity.SignOutStartTime2); DateTime offworkendlunch = Convert.ToDateTime(datenow + " " + attendancerulEntity.SignOutEndTime2); + + //中午上班时间 + DateTime workDateTimelunch = Convert.ToDateTime(datenow + " " + attendancerulEntity.NoonWorkTime); //中午上班考勤时间段 DateTime workstartlunch = Convert.ToDateTime(datenow + " " + attendancerulEntity.SignInStartTime2); DateTime workendlunch = Convert.ToDateTime(datenow + " " + attendancerulEntity.SignInEndTime2); //中午最早签退时间，默认中午下班开始时间。 DateTime offworkDateTimelunchFree = offworkstartlunch; - ////下班最早签退时间 - //DateTime offworkDateTimeFree = offworkDateTime; - if (attendancerulEntity.LeaveOverTime.HasValue && attendancerulEntity.LeaveOverTime != 0 - ) //如果允许早退，获取范围 + if (attendancerulEntity.LeaveOverTime.HasValue && attendancerulEntity.LeaveOverTime != 0) //如果允许早退，获取范围 { offworkDateTimelunchFree = offworkDateTimelunch.AddMinutes(-Convert.ToDouble(attendancerulEntity.LeaveOverTime)); - //offworkDateTimeFree = - // offworkDateTime.AddMinutes(-Convert.ToDouble(attendancerulEntity.LeaveOverTime)); - } - //中午最晚签到时间 - DateTime workDateTimelunchFree = workendlunch; - //获取迟到范围 - if (attendancerulEntity.LateOvertime.HasValue && attendancerulEntity.LateOvertime != 0) - { - workDateTimelunchFree = workDateTimelunch.AddMinutes(Convert.ToDouble(attendancerulEntity.LateOvertime)); } + ////中午最晚签到时间 + //DateTime workDateTimelunchFree = workendlunch; + ////获取迟到范围 + //if (attendancerulEntity.LateOvertime.HasValue && attendancerulEntity.LateOvertime != 0) + //{ + // workDateTimelunchFree = workDateTimelunch.AddMinutes(Convert.ToDouble(attendancerulEntity.LateOvertime)); + //} //上班 大于上班开始时间 ，小于中午最早签退时间 if (datetimenow > signInStartTime && datetimenow < offworkDateTimelunchFree && attendancerecordList.Count(x => x.ADType == "1") > 0)