chenwei
/
weaver-sskj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

出差流程没有外勤打卡不计算考勤

Browse Source
dev
chenwei 1 year ago
parent b9ee2a3cd3
commit 9fd753a08e
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

38
src/com/engine/kq/biz/KQReportBiz.java
Unescape Escape View File

@ -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<>'' "); 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 " + // 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; // " 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); // basebean.writeLog("getDailyToComLeaveData sql: " + sql);
//
rs.executeQuery(sql); // rs.executeQuery(sql);
while (rs.next()) { // while (rs.next()) {
double duration = Util.getDoubleValue(Util.null2String(rs.getString("duration"))); // double duration = Util.getDoubleValue(Util.null2String(rs.getString("duration")));
String kqdate = Util.null2String(rs.getString("startdate")); // String kqdate = Util.null2String(rs.getString("startdate"));
if ( duration > 0.00){ // if ( duration > 0.00){
double temp = Util.getDoubleValue(Util.null2String(datas.get("DailyToComLeaveData|" + resourceId + "|" + kqdate))); // double temp = Util.getDoubleValue(Util.null2String(datas.get("DailyToComLeaveData|" + resourceId + "|" + kqdate)));
if (temp <= 0.00) { // if (temp <= 0.00) {
datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, duration); // datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, duration);
} else { // } else {
datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, temp + duration); // datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, temp + duration);
} // }
} // }
} // }
}catch (Exception e){ }catch (Exception e){

Write Preview
Loading…
Cancel
Save