@ -381,7 +381,9 @@ public class KQReportBiz extends BaseBean {
}
sql=" select resourceid, newleavetype, durationrule, sum(duration) as val from hrmresource a, "+KqSplitFlowTypeEnum.LEAVEBACK.getTablename()+" b "+
" where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND groupid = groupId) "+sqlWhere+
" where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) "+
"and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND groupid = "+
"(select top 1 groupid from kq_shiftschedule where resourceid = b.resourceid and serialid = b.serialid and kqdate = b.belongdate)) "+sqlWhere+
" group by resourceid, newleavetype, durationrule ";
rs.execute(sql);
while(rs.next()){
@ -473,7 +475,10 @@ public class KQReportBiz extends BaseBean {
}
sql=" select resourceid, newleavetype, durationrule, sum(duration) as val from hrmresource a, "+KqSplitFlowTypeEnum.LEAVE.getTablename()+" b "+
" where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND groupid = groupId) "+sqlWhere+
" where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and "+
"(DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 "+
"AND groupid = (select top 1 groupid from kq_shiftschedule where resourceid = b.resourceid "+
" and serialid = b.serialid and kqdate = b.belongdate)) "+sqlWhere+
" group by resourceid, newleavetype, durationrule ";
rs.execute(sql);
while(rs.next()){
@ -567,7 +572,9 @@ public class KQReportBiz extends BaseBean {
}
sql=" select resourceid, newleavetype, durationrule, sum(duration) as val,belongdate from hrmresource a, "+KqSplitFlowTypeEnum.LEAVEBACK.getTablename()+" b "+
" where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND groupid = groupId) "+sqlWhere+
" where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) "+
"and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND groupid = "+
"(select top 1 groupid from kq_shiftschedule where resourceid = b.resourceid and serialid = b.serialid and kqdate = b.belongdate)) "+sqlWhere+
" group by resourceid, newleavetype, durationrule,belongdate ";
rs.execute(sql);
while(rs.next()){
@ -659,7 +666,9 @@ public class KQReportBiz extends BaseBean {
}
sql=" select resourceid, newleavetype, durationrule, sum(duration) as val,belongdate from hrmresource a, "+KqSplitFlowTypeEnum.LEAVE.getTablename()+" b "+
" where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND groupid = groupId) "+sqlWhere+
" where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) "+
"and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND groupid = "+
"(select top 1 groupid from kq_shiftschedule where resourceid = b.resourceid and serialid = b.serialid and kqdate = b.belongdate)) "+sqlWhere+
" group by resourceid, newleavetype, durationrule,belongdate ";
rs.execute(sql);
while(rs.next()){
@ -2563,5 +2572,4 @@ public class KQReportBiz extends BaseBean {