parent
11c0e27a8a
commit
48a94c6c68
|
@ -81,6 +81,7 @@ public class FinanceReportfordatePlugin extends AbstractReportListDataPlugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
HashMap<Long, List<Long>> map = new HashMap<>();//组织层级关系
|
HashMap<Long, List<Long>> map = new HashMap<>();//组织层级关系
|
||||||
|
List<Long> ids = new ArrayList<>();
|
||||||
//如果有组织则单独处理,没有则走getOrgrelate方法
|
//如果有组织则单独处理,没有则走getOrgrelate方法
|
||||||
if (shkd_seluserpower==null){
|
if (shkd_seluserpower==null){
|
||||||
getOrgrelate(map, selorgDy);
|
getOrgrelate(map, selorgDy);
|
||||||
|
@ -95,6 +96,9 @@ public class FinanceReportfordatePlugin extends AbstractReportListDataPlugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
for (Long key : map.keySet()) {
|
||||||
|
ids.add(key);
|
||||||
|
}
|
||||||
|
|
||||||
//根据组织关系配置sql
|
//根据组织关系配置sql
|
||||||
StringBuilder sqlBuilder = new StringBuilder("/*dialect*/ ");
|
StringBuilder sqlBuilder = new StringBuilder("/*dialect*/ ");
|
||||||
|
@ -104,11 +108,12 @@ public class FinanceReportfordatePlugin extends AbstractReportListDataPlugin {
|
||||||
DataSet res = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), sqlBuilder.toString());//财务云
|
DataSet res = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), sqlBuilder.toString());//财务云
|
||||||
|
|
||||||
|
|
||||||
|
QFilter filter = new QFilter("id", QCP.in, ids);
|
||||||
|
|
||||||
//业务单元数据集
|
//业务单元数据集
|
||||||
DataSet balanceDataSet = QueryServiceHelper.queryDataSet(this.getClass().getSimpleName(),"bos_org","id,number as shkd_orgnumber,name as shkd_org", null, null);
|
DataSet balanceDataSet = QueryServiceHelper.queryDataSet(this.getClass().getSimpleName(),"bos_org","id,number as shkd_orgnumber,name as shkd_org", filter.toArray(), null);
|
||||||
|
|
||||||
JoinDataSet join = res.join(balanceDataSet, JoinType.INNER);//连接组织
|
JoinDataSet join = res.join(balanceDataSet, JoinType.RIGHT);//连接组织
|
||||||
|
|
||||||
DataSet dataSet = join.on("zz","id").select(new String[]{
|
DataSet dataSet = join.on("zz","id").select(new String[]{
|
||||||
"shkd_orgnumber","shkd_org",
|
"shkd_orgnumber","shkd_org",
|
||||||
|
|
Loading…
Reference in New Issue