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-29 10:48:17 +08:00
parent fda3a64e29
commit e20ae7c05e
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportPlugin.java
View File

@ -176,11 +176,11 @@ public class FinanceReportPlugin extends AbstractReportListDataPlugin {
"(shkd_yxzamount*shkd_yxzqx+shkd_yxxtamount*shkd_yxxtqx+shkd_qtqyrzamount*shkd_qtqyrzqx)/(shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount) end as shkd_11to13qx", "(shkd_yxzamount*shkd_yxzqx+shkd_yxxtamount*shkd_yxxtqx+shkd_qtqyrzamount*shkd_qtqyrzqx)/(shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount) end as shkd_11to13qx",
//1至13合计 //1至13合计
"(shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_jtnbjkamount+shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount)/"+selmoney+" as shkd_1to13je", "(shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount)/"+selmoney+" as shkd_1to13je",
"case when (shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_jtnbjkamount+shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount)=0 then 0 else " + "case when (shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount)=0 then 0 else " +
"(shkd_zqrzamount*shkd_zqrzrzcb+shkd_dqjkamount*shkd_dqjkrzcb+shkd_zcqldamount*shkd_zcqldrzcb+shkd_xmdkamount*shkd_xmdkrzcb+shkd_rzzlamount*shkd_rzzlrzcb+shkd_bxzjrzamount*shkd_bxzjrzrzcb+shkd_yfpjamount*shkd_yfpjrzcb+shkd_fjrqyjkamount*shkd_fjrqyjkrzcb+shkd_qtzwrzamount*shkd_qtzwrzrzcb+shkd_jtnbjkamount*shkd_jtnbjkrzcb+shkd_yxzamount*shkd_yxzrzcb+shkd_yxxtamount*shkd_yxxtrzcb+shkd_qtqyrzamount*shkd_qtqyrzrzcb)/(shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_jtnbjkamount+shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount) end as shkd_1to13jrcb", "(shkd_zqrzamount*shkd_zqrzrzcb+shkd_dqjkamount*shkd_dqjkrzcb+shkd_zcqldamount*shkd_zcqldrzcb+shkd_xmdkamount*shkd_xmdkrzcb+shkd_rzzlamount*shkd_rzzlrzcb+shkd_bxzjrzamount*shkd_bxzjrzrzcb+shkd_yfpjamount*shkd_yfpjrzcb+shkd_fjrqyjkamount*shkd_fjrqyjkrzcb+shkd_qtzwrzamount*shkd_qtzwrzrzcb+shkd_yxzamount*shkd_yxzrzcb+shkd_yxxtamount*shkd_yxxtrzcb+shkd_qtqyrzamount*shkd_qtqyrzrzcb)/(shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount) end as shkd_1to13jrcb",
"case when (shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_jtnbjkamount+shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount)=0 then 0 else " + "case when (shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount)=0 then 0 else " +
"(shkd_zqrzamount*shkd_zqrzqx+shkd_dqjkamount*shkd_dqjkqx+shkd_zcqldamount*shkd_zcqldqx+shkd_xmdkamount*shkd_xmdkqx+shkd_rzzlamount*shkd_rzzlqx+shkd_bxzjrzamount*shkd_bxzjrzqx+shkd_yfpjamount*shkd_yfpjqx+shkd_fjrqyjkamount*shkd_fjrqyjkqx+shkd_qtzwrzamount*shkd_qtzwrzqx+shkd_jtnbjkamount*shkd_jtnbjkqx+shkd_yxzamount*shkd_yxzqx+shkd_yxxtamount*shkd_yxxtqx+shkd_qtqyrzamount*shkd_qtqyrzqx)/(shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_jtnbjkamount+shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount) end as shkd_1to13qx" "(shkd_zqrzamount*shkd_zqrzqx+shkd_dqjkamount*shkd_dqjkqx+shkd_zcqldamount*shkd_zcqldqx+shkd_xmdkamount*shkd_xmdkqx+shkd_rzzlamount*shkd_rzzlqx+shkd_bxzjrzamount*shkd_bxzjrzqx+shkd_yfpjamount*shkd_yfpjqx+shkd_fjrqyjkamount*shkd_fjrqyjkqx+shkd_qtzwrzamount*shkd_qtzwrzqx+shkd_yxzamount*shkd_yxzqx+shkd_yxxtamount*shkd_yxxtqx+shkd_qtqyrzamount*shkd_qtqyrzqx)/(shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount) end as shkd_1to13qx"
}).finish(); }).finish();
return dataSet; return dataSet;
} }

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

@ -150,10 +150,10 @@ public class FinanceReportfordatePlugin extends AbstractReportListDataPlugin {
"(shkd_yxzxzhke+shkd_yxxtxzhke+shkd_qtqyrzxzhke)/"+selmoney+" as shkd_11to13xzhke", "(shkd_yxzxzhke+shkd_yxxtxzhke+shkd_qtqyrzxzhke)/"+selmoney+" as shkd_11to13xzhke",
"(shkd_yxzqmye+shkd_yxxtqmye+shkd_qtqyrzqmye)/"+selmoney+" as shkd_11to13qmye", "(shkd_yxzqmye+shkd_yxxtqmye+shkd_qtqyrzqmye)/"+selmoney+" as shkd_11to13qmye",
//1至13合计 //1至13合计
"(shkd_zqrzqcye+shkd_dqjkqcye+shkd_zcqldqcye+shkd_xmdkqcye+shkd_rzzlqcye+shkd_bxzjrzqcye+shkd_yfpjqcye+shkd_fjrqyjkqcye+shkd_qtzwrzqcye+shkd_jtnbjkqcye+shkd_yxzqcye+shkd_yxxtqcye+shkd_qtqyrzqcye)/"+selmoney+" as shkd_1to13qcye", "(shkd_zqrzqcye+shkd_dqjkqcye+shkd_zcqldqcye+shkd_xmdkqcye+shkd_rzzlqcye+shkd_bxzjrzqcye+shkd_yfpjqcye+shkd_fjrqyjkqcye+shkd_qtzwrzqcye+shkd_yxzqcye+shkd_yxxtqcye+shkd_qtqyrzqcye)/"+selmoney+" as shkd_1to13qcye",
"(shkd_zqrzxzrze+shkd_dqjkxzrze+shkd_zcqldxzrze+shkd_xmdkxzrze+shkd_rzzlxzrze+shkd_bxzjrzxzrze+shkd_yfpjxzrze+shkd_fjrqyjkxzrze+shkd_qtzwrzxzrze+shkd_jtnbjkxzrze+shkd_yxzxzrze+shkd_yxxtxzrze+shkd_qtqyrzxzrze)/"+selmoney+" as shkd_1to13xzrze", "(shkd_zqrzxzrze+shkd_dqjkxzrze+shkd_zcqldxzrze+shkd_xmdkxzrze+shkd_rzzlxzrze+shkd_bxzjrzxzrze+shkd_yfpjxzrze+shkd_fjrqyjkxzrze+shkd_qtzwrzxzrze+shkd_yxzxzrze+shkd_yxxtxzrze+shkd_qtqyrzxzrze)/"+selmoney+" as shkd_1to13xzrze",
"(shkd_zqrzxzhke+shkd_dqjkxzhke+shkd_zcqldxzhke+shkd_xmdkxzhke+shkd_rzzlxzhke+shkd_bxzjrzxzhke+shkd_yfpjxzhke+shkd_fjrqyjkxzhke+shkd_qtzwrzxzhke+shkd_jtnbjkxzhke+shkd_yxzxzhke+shkd_yxxtxzhke+shkd_qtqyrzxzhke)/"+selmoney+" as shkd_1to13xzhke", "(shkd_zqrzxzhke+shkd_dqjkxzhke+shkd_zcqldxzhke+shkd_xmdkxzhke+shkd_rzzlxzhke+shkd_bxzjrzxzhke+shkd_yfpjxzhke+shkd_fjrqyjkxzhke+shkd_qtzwrzxzhke+shkd_yxzxzhke+shkd_yxxtxzhke+shkd_qtqyrzxzhke)/"+selmoney+" as shkd_1to13xzhke",
"(shkd_zqrzqmye+shkd_dqjkqmye+shkd_zcqldqmye+shkd_xmdkqmye+shkd_rzzlqmye+shkd_bxzjrzqmye+shkd_yfpjqmye+shkd_fjrqyjkqmye+shkd_qtzwrzqmye+shkd_jtnbjkqmye+shkd_yxzqmye+shkd_yxxtqmye+shkd_qtqyrzqmye)/"+selmoney+" as shkd_1to13qmye" "(shkd_zqrzqmye+shkd_dqjkqmye+shkd_zcqldqmye+shkd_xmdkqmye+shkd_rzzlqmye+shkd_bxzjrzqmye+shkd_yfpjqmye+shkd_fjrqyjkqmye+shkd_qtzwrzqmye+shkd_yxzqmye+shkd_yxxtqmye+shkd_qtqyrzqmye)/"+selmoney+" as shkd_1to13qmye"
}).finish(); }).finish();
DataSet dataSet2 = dataSet.groupBy(null).sum("shkd_jtnbjkqcye").sum("shkd_jtnbjkxzrze").sum("shkd_jtnbjkxzhke").sum("shkd_jtnbjkqmye").finish(); DataSet dataSet2 = dataSet.groupBy(null).sum("shkd_jtnbjkqcye").sum("shkd_jtnbjkxzrze").sum("shkd_jtnbjkxzhke").sum("shkd_jtnbjkqmye").finish();

18
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewPlugin.java
View File

@ -79,21 +79,21 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin {
// groupSelect = BANK_GROUP_SELECT; // groupSelect = BANK_GROUP_SELECT;
// this.setSumNameField("bank"); // this.setSumNameField("bank");
upSelect = "company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.e_useorg.name as sonorg, entrys.e_useorg.id as sonorgid, currency, entrys.transamt as upamount, 0 as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh"; upSelect = "company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, currency, entrys.transamt as upamount, 0 as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh";
downSelect = "company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.e_useorg.name as sonorg, entrys.e_useorg.id as sonorgid, currency, 0 as upamount, entrys.transamt as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh"; downSelect = "company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, currency, 0 as upamount, entrys.transamt as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh";
select = "parentorg, parentorgid, bank, bankid, sonorg, sonorgid, upamount_report as upamount, downamount_report as downamount,shkd_subacct,shkd_zzhkhh"; select = "parentorg, parentorgid, bank, bankid, sonorg, sonorgid, upamount_report as upamount, downamount_report as downamount,shkd_subacct,shkd_zzhkhh";
groupSelect = BANK_GROUP_SELECT; groupSelect = BANK_GROUP_SELECT;
this.setSumNameField("bank"); this.setSumNameField("bank");
} else {//不走 } else {//不走
upSelect = "company.name as parentorg, company.id as parentorgid, entrys.e_useorg.name as sonorg, entrys.e_useorg.id as sonorgid, bank.name as bank, bank.id as bankid, currency, entrys.transamt as upamount, 0 as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh"; upSelect = "company.name as parentorg, company.id as parentorgid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, bank.name as bank, bank.id as bankid, currency, entrys.transamt as upamount, 0 as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh";
downSelect = "company.name as parentorg, company.id as parentorgid, entrys.e_useorg.name as sonorg, entrys.e_useorg.id as sonorgid, bank.name as bank, bank.id as bankid, currency, 0 as upamount, entrys.transamt as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh"; downSelect = "company.name as parentorg, company.id as parentorgid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, bank.name as bank, bank.id as bankid, currency, 0 as upamount, entrys.transamt as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh";
select = "parentorg, parentorgid,sonorg, sonorgid, bank, bankid, upamount_report as upamount, downamount_report as downamount,shkd_subacct,shkd_zzhkhh"; select = "parentorg, parentorgid,sonorg, sonorgid, bank, bankid, upamount_report as upamount, downamount_report as downamount,shkd_subacct,shkd_zzhkhh";
groupSelect = SON_ORG_GROUP_SELECT; groupSelect = SON_ORG_GROUP_SELECT;
this.setSumNameField("sonorg"); this.setSumNameField("sonorg");
} }
DataSet upDataSet = QueryServiceHelper.queryDataSet("fca_transupbill", "fca_transupbill", upSelect, filter.toArray(), "company,entrys.e_useorg"); DataSet upDataSet = QueryServiceHelper.queryDataSet("fca_transupbill", "fca_transupbill", upSelect, filter.toArray(), "company,entrys.subacct_company");
DataSet downDataSet = QueryServiceHelper.queryDataSet("fca_transdownbill", "fca_transdownbill", downSelect, filter.toArray(), "company,entrys.e_useorg"); DataSet downDataSet = QueryServiceHelper.queryDataSet("fca_transdownbill", "fca_transdownbill", downSelect, filter.toArray(), "company,entrys.subacct_company");
DataSet dataSet = upDataSet.union(downDataSet); DataSet dataSet = upDataSet.union(downDataSet);
dataSet = this.addExchangeRateAndCurrencyUnit(dataSet, paramMap); dataSet = this.addExchangeRateAndCurrencyUnit(dataSet, paramMap);
// DynamicObjectCollection srcCollection = ORM.create().toPlainDynamicObjectCollection(dataSet.copy()); // DynamicObjectCollection srcCollection = ORM.create().toPlainDynamicObjectCollection(dataSet.copy());
@ -183,7 +183,7 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin {
} }
if (paramMap.get("filter_sonorg") != null) { if (paramMap.get("filter_sonorg") != null) {
filter.and("entrys.e_useorg", "in", paramMap.get("filter_sonorg")); filter.and("entrys.subacct_company", "in", paramMap.get("filter_sonorg"));
} }
if (paramMap.get("filter_accountgroup") != null) { if (paramMap.get("filter_accountgroup") != null) {
@ -313,10 +313,10 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin {
} }
//查询本年上划下拨 //查询本年上划下拨
DataSet upDataSet = QueryServiceHelper.queryDataSet("fca_transupbill", "fca_transupbill", DataSet upDataSet = QueryServiceHelper.queryDataSet("fca_transupbill", "fca_transupbill",
"company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.e_useorg.name as sonorg, entrys.e_useorg.id as sonorgid, currency, entrys.transamt as upamount,0 as downamount,entrys.subacct as shkd_subacct", "company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, currency, entrys.transamt as upamount,0 as downamount,entrys.subacct as shkd_subacct",
qFilterbn.toArray(), "company");//上划 qFilterbn.toArray(), "company");//上划
DataSet downDataSet = QueryServiceHelper.queryDataSet("fca_transdownbill", "fca_transdownbill", DataSet downDataSet = QueryServiceHelper.queryDataSet("fca_transdownbill", "fca_transdownbill",
"company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.e_useorg.name as sonorg, entrys.e_useorg.id as sonorgid, currency, 0 as upamount,entrys.transamt as downamount,entrys.subacct as shkd_subacct", "company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, currency, 0 as upamount,entrys.transamt as downamount,entrys.subacct as shkd_subacct",
qFilterbn.toArray(), "company");//下拨 qFilterbn.toArray(), "company");//下拨
DataSet dataSet = upDataSet.union(downDataSet); DataSet dataSet = upDataSet.union(downDataSet);