|
|
|
@ -1569,7 +1569,7 @@ public class KQReportBiz extends BaseBean {
|
|
|
|
|
|
|
|
|
|
//获取加班时长
|
|
|
|
|
Map<String, Object> dailyFlowOverTimeData = getDailyFlowOverTimeDataAllowance(params, user);
|
|
|
|
|
bb.writeLog("dailyFlowOverTimeData: " + dailyFlowOverTimeData);
|
|
|
|
|
// bb.writeLog("dailyFlowOverTimeData: " + dailyFlowOverTimeData);
|
|
|
|
|
|
|
|
|
|
String otherstatsub = Util.null2String(bb.getPropValue("project_hostar", "otherstatsubcompany"));
|
|
|
|
|
if (StringUtils.isNotBlank(otherstatsub)) {
|
|
|
|
@ -1819,7 +1819,7 @@ public class KQReportBiz extends BaseBean {
|
|
|
|
|
|
|
|
|
|
//获取加班时长
|
|
|
|
|
Map<String, Object> dailyFlowOverTimeData = getDailyFlowOverTimeDataAllowance(params, user);
|
|
|
|
|
bb.writeLog("dailyFlowOverTimeData: " + dailyFlowOverTimeData);
|
|
|
|
|
// bb.writeLog("dailyFlowOverTimeData: " + dailyFlowOverTimeData);
|
|
|
|
|
|
|
|
|
|
//获取夜班班次
|
|
|
|
|
List<String> nightShiftList = new ArrayList<>();
|
|
|
|
@ -2109,7 +2109,7 @@ public class KQReportBiz extends BaseBean {
|
|
|
|
|
// long endTime11 = System.currentTimeMillis();
|
|
|
|
|
// long elapsedTime11 = endTime11 - startTime11; // 执行时间
|
|
|
|
|
// bb.writeLog("加班时长执行时间:" + elapsedTime11 + "毫秒" );
|
|
|
|
|
bb.writeLog("dailyFlowOverTimeData: " + dailyFlowOverTimeData);
|
|
|
|
|
// bb.writeLog("dailyFlowOverTimeData: " + dailyFlowOverTimeData);
|
|
|
|
|
|
|
|
|
|
//首先去除指定不享有的分部
|
|
|
|
|
// long startTime12 = System.currentTimeMillis();
|
|
|
|
@ -2125,7 +2125,7 @@ public class KQReportBiz extends BaseBean {
|
|
|
|
|
// long endTime12 = System.currentTimeMillis();
|
|
|
|
|
// long elapsedTime12 = endTime12 - startTime12; // 执行时间
|
|
|
|
|
// bb.writeLog("不享有的分部执行时间:" + elapsedTime12 + "毫秒" );
|
|
|
|
|
bb.writeLog("subComoanyList: " + subComoanyList);
|
|
|
|
|
bb.writeLog("getDailyStatAllowanceData subComoanyList: " + subComoanyList);
|
|
|
|
|
|
|
|
|
|
String subComoanys = "";
|
|
|
|
|
if ( subComoanyList != null && subComoanyList.size() > 0) {
|
|
|
|
@ -2152,7 +2152,7 @@ public class KQReportBiz extends BaseBean {
|
|
|
|
|
|
|
|
|
|
List<String> resIds = new ArrayList<>();
|
|
|
|
|
String acqResSql = "select a.id from hrmresource a where a.status in (0,1,2,3) " + sqlWhere;
|
|
|
|
|
bb.writeLog("acqResSql: " + acqResSql);
|
|
|
|
|
bb.writeLog("getDailyStatAllowanceData acqResSql: " + acqResSql);
|
|
|
|
|
|
|
|
|
|
rs.executeQuery(acqResSql);
|
|
|
|
|
while (rs.next()) {
|
|
|
|
@ -2161,7 +2161,7 @@ public class KQReportBiz extends BaseBean {
|
|
|
|
|
resIds.add(id);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
bb.writeLog("resIds: " + resIds);
|
|
|
|
|
bb.writeLog("getDailyStatAllowanceData resIds: " + resIds);
|
|
|
|
|
|
|
|
|
|
if (resIds != null && resIds.size() > 0 && StringUtils.isNotBlank(fromDate) && StringUtils.isNotBlank(toDate)) {
|
|
|
|
|
HostarUtil houtil = new HostarUtil();
|
|
|
|
@ -2323,7 +2323,7 @@ public class KQReportBiz extends BaseBean {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
bb.writeLog("signIdList: " + signIdList);
|
|
|
|
|
// bb.writeLog("signIdList: " + signIdList);
|
|
|
|
|
|
|
|
|
|
Integer signNumber = 0;
|
|
|
|
|
if (signIdList !=null && signIdList.size() > 0) {
|
|
|
|
@ -2373,7 +2373,7 @@ public class KQReportBiz extends BaseBean {
|
|
|
|
|
}
|
|
|
|
|
}catch (Exception e){
|
|
|
|
|
writeLog(e);
|
|
|
|
|
bb.writeLog("DailyStatAllowance Exception: " + e);
|
|
|
|
|
bb.writeLog("DailyStatAllowance Exception: " + e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
bb.writeLog("DailyStatAllowance datas: " + datas);
|
|
|
|
|
|
|
|
|
|