Commit c795c937 authored by 廖旭伟's avatar 廖旭伟

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

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