diff --git a/src/com/engine/kq/biz/KQReportBiz.java b/src/com/engine/kq/biz/KQReportBiz.java index 1c84357..d2ffc77 100644 --- a/src/com/engine/kq/biz/KQReportBiz.java +++ b/src/com/engine/kq/biz/KQReportBiz.java @@ -381,7 +381,7 @@ public class KQReportBiz extends BaseBean { //考勤二开--转事假 - datas.putAll(getDailyToComLeaveData(params,user)); +// datas.putAll(getDailyToComLeaveData(params,user)); //考勤二开--异常考勤转事假 @@ -417,7 +417,7 @@ public class KQReportBiz extends BaseBean { //考勤二开--转事假 - datas.putAll(getToComLeaveData(params,user)); +// datas.putAll(getToComLeaveData(params,user)); //考勤二开--统计公休时长 @@ -962,23 +962,23 @@ public class KQReportBiz extends BaseBean { sqlWhere += " and c.loginid is not null " + (rs.getDBType().equals("oracle") ? "" : " and c.loginid<>'' "); } - sql = " select * from (select * from uf_casleave a left join hrmresource b on a.resourceid = b.id " + - " where a.startdate >='" + fromDate + "' and a.enddate <='" + toDate +"' and ( a.isdecu = 0 or a.isdecu is null ) ) c where 1=1 " + sqlWhere; - basebean.writeLog("getDailyToComLeaveData sql: " + sql); - - rs.executeQuery(sql); - while (rs.next()) { - double duration = Util.getDoubleValue(Util.null2String(rs.getString("duration"))); - String kqdate = Util.null2String(rs.getString("startdate")); - if ( duration > 0.00){ - double temp = Util.getDoubleValue(Util.null2String(datas.get("DailyToComLeaveData|" + resourceId + "|" + kqdate))); - if (temp <= 0.00) { - datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, duration); - } else { - datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, temp + duration); - } - } - } +// sql = " select * from (select * from uf_casleave a left join hrmresource b on a.resourceid = b.id " + +// " where a.startdate >='" + fromDate + "' and a.enddate <='" + toDate +"' and ( a.isdecu = 0 or a.isdecu is null ) ) c where 1=1 " + sqlWhere; +// basebean.writeLog("getDailyToComLeaveData sql: " + sql); +// +// rs.executeQuery(sql); +// while (rs.next()) { +// double duration = Util.getDoubleValue(Util.null2String(rs.getString("duration"))); +// String kqdate = Util.null2String(rs.getString("startdate")); +// if ( duration > 0.00){ +// double temp = Util.getDoubleValue(Util.null2String(datas.get("DailyToComLeaveData|" + resourceId + "|" + kqdate))); +// if (temp <= 0.00) { +// datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, duration); +// } else { +// datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, temp + duration); +// } +// } +// } }catch (Exception e){