wenlukang1
/
CTSK_DEV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交人：陈绍鑫 

日期：2025/4/23 16：30
内容:上划下拨（new）插件
This commit is contained in:
陈绍鑫 2025-04-23 15:39:26 +08:00
parent 11c0e27a8a
commit 48a94c6c68
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordatePlugin.java
View File

@ -81,6 +81,7 @@ public class FinanceReportfordatePlugin extends AbstractReportListDataPlugin {
}
HashMap<Long, List<Long>> map = new HashMap<>();//组织层级关系
List<Long> ids = new ArrayList<>();
//如果有组织则单独处理，没有则走getOrgrelate方法
if (shkd_seluserpower==null){
getOrgrelate(map, selorgDy);
@ -95,6 +96,9 @@ public class FinanceReportfordatePlugin extends AbstractReportListDataPlugin {
}
}
for (Long key : map.keySet()) {
ids.add(key);
}
//根据组织关系配置sql
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());//财务云
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[]{
"shkd_orgnumber","shkd_org",