|
|
@ -2317,6 +2317,7 @@ public class KQBalanceOfLeaveBiz {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
RecordSet recordSet = new RecordSet();
|
|
|
|
RecordSet recordSet = new RecordSet();
|
|
|
|
recordSet.executeQuery(sql);
|
|
|
|
recordSet.executeQuery(sql);
|
|
|
|
|
|
|
|
BaseBean bb = new BaseBean();
|
|
|
|
while (recordSet.next()) {
|
|
|
|
while (recordSet.next()) {
|
|
|
|
/*获取人员的相关信息 start*/
|
|
|
|
/*获取人员的相关信息 start*/
|
|
|
|
String resourceId = recordSet.getString("id");
|
|
|
|
String resourceId = recordSet.getString("id");
|
|
|
@ -2338,8 +2339,12 @@ public class KQBalanceOfLeaveBiz {
|
|
|
|
/*获取人员所属分部对应的假期规则 start*/
|
|
|
|
/*获取人员所属分部对应的假期规则 start*/
|
|
|
|
//rulesDetailId = detailComInfo.getId(ruleId, subCompanyId, departmentId, resourceId);
|
|
|
|
//rulesDetailId = detailComInfo.getId(ruleId, subCompanyId, departmentId, resourceId);
|
|
|
|
/*#QC3429745# 批处理操作*/
|
|
|
|
/*#QC3429745# 批处理操作*/
|
|
|
|
rulesDetailId = getRulesDetailId(ruleId,subCompanyId, departmentId, resourceId,secLevel);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
rulesDetailId = getRulesDetailId(ruleId,subCompanyId, departmentId, resourceId,secLevel);
|
|
|
|
|
|
|
|
if ("86".equals(resourceId)) {
|
|
|
|
|
|
|
|
bb.writeLog(String.format("年假入参:%s,%s,%s,%s,%s",ruleId,subCompanyId,departmentId,resourceId,secLevel));
|
|
|
|
|
|
|
|
bb.writeLog("规则输出结果:"+rulesDetailId);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
distributionMode = Util.getIntValue(detailComInfo.getDistributionMode(ruleId, subCompanyId, departmentId, resourceId), 1);
|
|
|
|
distributionMode = Util.getIntValue(detailComInfo.getDistributionMode(ruleId, subCompanyId, departmentId, resourceId), 1);
|
|
|
|
legalKey = Util.getIntValue(detailComInfo.getLegalKey(ruleId, subCompanyId, departmentId, resourceId), 0);
|
|
|
|
legalKey = Util.getIntValue(detailComInfo.getLegalKey(ruleId, subCompanyId, departmentId, resourceId), 0);
|
|
|
@ -2542,6 +2547,7 @@ public class KQBalanceOfLeaveBiz {
|
|
|
|
private static String getRulesDetailId(String ruleId, String subCompanyId, String departmentId, String resourceId, String secLevel) {
|
|
|
|
private static String getRulesDetailId(String ruleId, String subCompanyId, String departmentId, String resourceId, String secLevel) {
|
|
|
|
String value = "";
|
|
|
|
String value = "";
|
|
|
|
RecordSet rs = new RecordSet();
|
|
|
|
RecordSet rs = new RecordSet();
|
|
|
|
|
|
|
|
BaseBean bb = new BaseBean();
|
|
|
|
//人员 > 部门 > 分部
|
|
|
|
//人员 > 部门 > 分部
|
|
|
|
String[] SCOPE_TYPES = {"3", "2", "1"};
|
|
|
|
String[] SCOPE_TYPES = {"3", "2", "1"};
|
|
|
|
String[] scopeValue = {resourceId, departmentId, subCompanyId};
|
|
|
|
String[] scopeValue = {resourceId, departmentId, subCompanyId};
|
|
|
@ -2558,7 +2564,9 @@ public class KQBalanceOfLeaveBiz {
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ("86".equals(resourceId)) {
|
|
|
|
|
|
|
|
bb.writeLog("规则输出结果1:"+value);
|
|
|
|
|
|
|
|
}
|
|
|
|
if (StringUtil.isNull(value)) {
|
|
|
|
if (StringUtil.isNull(value)) {
|
|
|
|
rs.executeQuery("select id from KQ_leaveRulesDetail where ruleId = ? and scopeType = 0 " +
|
|
|
|
rs.executeQuery("select id from KQ_leaveRulesDetail where ruleId = ? and scopeType = 0 " +
|
|
|
|
" and minLevel <= ? and maxLevel >= ?",ruleId,secLevel,secLevel);
|
|
|
|
" and minLevel <= ? and maxLevel >= ?",ruleId,secLevel,secLevel);
|
|
|
|