Commit 48dba697 authored by 赵啸非's avatar 赵啸非

修改请假计算考勤

parent e7d15e14
...@@ -405,10 +405,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract { ...@@ -405,10 +405,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
//goWorkDate为空 缺卡状态 //goWorkDate为空 缺卡状态
Date goWorkDate1 = attendanceClassDetailEntity.getGoWorkDate(); Date goWorkDate1 = attendanceClassDetailEntity.getGoWorkDate();
//判断请假区间是否在上班区间内 如果在 则设置为请假 格式化时间范围 //判断请假区间是否在上班区间内 如果在 则设置为请假 格式化时间范围
DateUtil.parse(DateUtil.format(startLeaveTime, "HH:mm:ss"),"HH:mm:ss") ;
DateUtil.parse(DateUtil.format(endLeaveTime, "HH:mm:ss"),"HH:mm:ss") ;
//DateUtil.
boolean in = DateUtil.isIn(goWorkDate1, DateUtil.parse(DateUtil.format(startLeaveTime, "HH:mm:ss"), "HH:mm:ss"), boolean in = DateUtil.isIn(goWorkDate1, DateUtil.parse(DateUtil.format(startLeaveTime, "HH:mm:ss"), "HH:mm:ss"),
DateUtil.parse(DateUtil.format(endLeaveTime, "HH:mm:ss"), "HH:mm:ss")); DateUtil.parse(DateUtil.format(endLeaveTime, "HH:mm:ss"), "HH:mm:ss"));
if(in){ if(in){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment