考勤打卡调整

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AttendanceCard/AttendanceCard.html

@@ -7,7 +7,7 @@
 			                    打卡
 			                </div>
 			            </div> -->
-						 <img id="attimg" src="images/dk.png" alt="" width="100%">
+						 <img id="attimg" src="" alt="" width="100%">
 			        </div>
 			  </div>
 			  <div class="footer">

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');
 					}
 				});
 

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";
 

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<ADR_RecordEntity>(
                     "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)