|
|
@@ -1165,13 +1165,16 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement |
|
|
|
{ |
|
|
|
adrresult.AttendanceType = 3; |
|
|
|
adrresult.AttendanceTypeString = "早退打卡"; |
|
|
|
adrresult.UserWorkTime = attendancerecordList.Where(m => m.ADType == "1").OrderByDescending(m => m.ADTime).First().ADTime.Value.ToString(); |
|
|
|
adrresult.UserCloseTime = attendancerecordList.Where(m => m.ADType == "2").OrderByDescending(m => m.ADTime).First().ADTime.Value.ToString(); |
|
|
|
var userWorkTime = attendancerecordList.Where(m => m.ADType == "1").OrderByDescending(m => m.ADTime).FirstOrDefault()?.ADTime.Value; |
|
|
|
var userCloseTime = attendancerecordList.Where(m => m.ADType == "2").OrderByDescending(m => m.ADTime).FirstOrDefault()?.ADTime.Value; |
|
|
|
adrresult.UserWorkTime = userWorkTime != null ? userWorkTime.ToString() : ""; |
|
|
|
adrresult.UserCloseTime = userCloseTime != null ? userCloseTime.ToString() : ""; |
|
|
|
return adrresult; |
|
|
|
} |
|
|
|
adrresult.AttendanceType = 3; |
|
|
|
adrresult.AttendanceTypeString = "早退打卡"; |
|
|
|
adrresult.UserWorkTime = attendancerecordList.OrderByDescending(m => m.ADTime).First().ADTime.Value.ToString(); |
|
|
|
var userWorkTime2 = attendancerecordList.OrderByDescending(m => m.ADTime).FirstOrDefault().ADTime.Value; |
|
|
|
adrresult.UserWorkTime = userWorkTime2 != null ? userWorkTime2.ToString() : ""; |
|
|
|
return adrresult; |
|
|
|
} |
|
|
|
//超过上班最晚签到时间 小于下班最早签退时间,黄色 |
|
|
@@ -1187,8 +1190,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement |
|
|
|
//更新最晚下班时间 |
|
|
|
adrresult.AttendanceType = 1; |
|
|
|
adrresult.AttendanceTypeString = "正常打卡"; |
|
|
|
adrresult.UserWorkTime = attendancerecordList.Where(m => m.ADType == "1").OrderByDescending(m => m.ADTime).First().ADTime.Value.ToString(); |
|
|
|
adrresult.UserCloseTime = attendancerecordList.Where(m => m.ADType == "2").OrderByDescending(m => m.ADTime).First().ADTime.Value.ToString(); |
|
|
|
var userWorkTime= attendancerecordList.Where(m => m.ADType == "1").OrderByDescending(m => m.ADTime).FirstOrDefault()?.ADTime.Value; |
|
|
|
var userCloseTime = attendancerecordList.Where(m => m.ADType == "2").OrderByDescending(m => m.ADTime).FirstOrDefault()?.ADTime.Value; |
|
|
|
adrresult.UserWorkTime = userWorkTime != null ? userWorkTime.ToString() : ""; |
|
|
|
adrresult.UserCloseTime = userCloseTime != null ? userCloseTime.ToString() : ""; |
|
|
|
return adrresult; |
|
|
|
} |
|
|
|
} |
|
|
|