Commit 36ebcea5 authored by 廖旭伟's avatar 廖旭伟

考勤汇总节假日周末补班没有正常汇总bug修改

parent c65ac0b9
......@@ -210,7 +210,14 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
Calendar cal = Calendar.getInstance();
cal.setTime(summaryDate);
int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
query.setDayOfWeek(dayOfWeek);
if(dayOfWeek==1||dayOfWeek==7){
//节假日周末补班
if(!isReturn){
query.setDayOfWeek(2);
}
}else {
query.setDayOfWeek(dayOfWeek);
}
int y = cal.get(Calendar.YEAR);
int m = cal.get(Calendar.MONTH)+1;
int d = cal.get(Calendar.DATE);
......
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