diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewFormPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewFormPlugin.java index 921f97e..4cd0ddb 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewFormPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewFormPlugin.java @@ -35,8 +35,8 @@ import kd.tmc.fca.common.enums.StatisCycleEnum; public class transbillreportnewFormPlugin extends AbstractReportFormPlugin implements HyperLinkClickListener { - private static final String[] BANK_DIMENSION = new String[]{"sumlevel", "parentorg", "parentorgid", "bank", "bankid", "sonorg", "sonorgid", "shkd_subacct", "shkd_subacctnumber","statcurrency", "shkd_nckyye","shkd_bnupamount","shkd_bndownamount","shkd_bndifferenceamount","shkd_qckyye", "upamount", "downamount", "differenceamount","shkd_qmkyye"}; - private static final String[] SON_ORG_DIMENSION = new String[]{"sumlevel", "parentorg", "parentorgid", "sonorg", "sonorgid", "bank", "bankid", "shkd_subacct", "shkd_subacctnumber","statcurrency", "shkd_nckyye","shkd_bnupamount","shkd_bndownamount","shkd_bndifferenceamount","shkd_qckyye", "upamount", "downamount", "differenceamount","shkd_qmkyye"}; + private static final String[] BANK_DIMENSION = new String[]{"sumlevel", "parentorg", "parentorgid", "bank", "bankid", "sonorg", "sonorgid","shkd_zzhkhh", "shkd_subacct", "shkd_subacctnumber","statcurrency", "shkd_nckyye","shkd_bnupamount","shkd_bndownamount","shkd_bndifferenceamount","shkd_qckyye", "upamount", "downamount", "differenceamount","shkd_qmkyye"}; + private static final String[] SON_ORG_DIMENSION = new String[]{"sumlevel", "parentorg", "parentorgid", "sonorg", "sonorgid", "bank", "bankid","shkd_zzhkhh" , "shkd_subacct", "shkd_subacctnumber","statcurrency", "shkd_nckyye","shkd_bnupamount","shkd_bndownamount","shkd_bndifferenceamount","shkd_qckyye", "upamount", "downamount", "differenceamount","shkd_qmkyye"}; @Override public void hyperLinkClick(HyperLinkClickEvent evt) { String field = evt.getFieldName(); diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewPlugin.java index f080ac1..76a45ca 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewPlugin.java @@ -58,8 +58,8 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin { private static final String DOWN_SON_ORG_SELECT = "company.name as parentorg, company.id as parentorgid, entrys.e_useorg.name as sonorg, entrys.e_useorg.id as sonorgid, currency, 0 as upamount, entrys.transamt as downamount"; private static final String BANK_SELECT = "parentorg, parentorgid, bank, bankid, upamount_report as upamount, downamount_report as downamount"; private static final String SON_ORG_SELECT = "parentorg, parentorgid, sonorg, sonorgid, upamount_report as upamount, downamount_report as downamount"; - private static final String[] BANK_GROUP_SELECT = new String[]{"parentorg", "parentorgid", "bank", "bankid","sonorg","sonorgid","shkd_subacct"}; - private static final String[] SON_ORG_GROUP_SELECT = new String[]{"parentorg", "parentorgid", "sonorg","sonorgid","bank", "bankid","shkd_subacct"}; + private static final String[] BANK_GROUP_SELECT = new String[]{"parentorg", "parentorgid", "bank", "bankid","sonorg","sonorgid","shkd_subacct","shkd_zzhkhh"}; + private static final String[] SON_ORG_GROUP_SELECT = new String[]{"parentorg", "parentorgid", "sonorg","sonorgid","bank", "bankid","shkd_subacct","shkd_zzhkhh"}; private List sumAmountFieldList; private String sumNameField; private boolean isCompute = true; @@ -79,15 +79,15 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin { // groupSelect = BANK_GROUP_SELECT; // 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 as shkd_subacct"; - 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 as shkd_subacct"; - select = "parentorg, parentorgid, bank, bankid, sonorg, sonorgid, upamount_report as upamount, downamount_report as downamount,shkd_subacct"; + 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 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 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"; groupSelect = BANK_GROUP_SELECT; this.setSumNameField("bank"); } 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 as shkd_subacct"; - 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 as shkd_subacct"; - select = "parentorg, parentorgid,sonorg, sonorgid, bank, bankid, upamount_report as upamount, downamount_report as downamount,shkd_subacct"; + 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 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 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"; groupSelect = SON_ORG_GROUP_SELECT; this.setSumNameField("sonorg"); } @@ -117,12 +117,13 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin { sumAmountFieldList.add("shkd_bndownamount"); sumAmountFieldList.add("shkd_bndifferenceamount"); sumAmountFieldList.add("shkd_qmkyye"); + this.setSumAmountFieldList(sumAmountFieldList); dataSet = dataSet.addField("upamount - downamount", "differenceamount"); JoinDataSet join = dataSet.join(getqc, JoinType.LEFT);//连接 dataSet = join.on("shkd_subacct","shkd_subacct") - .select(new String[]{"parentorg", "parentorgid", "bank", "bankid", "sonorg", "sonorgid","shkd_nckyye","shkd_qckyye","shkd_bnupamount","shkd_bndownamount", "upamount", "downamount","shkd_subacct","differenceamount","shkd_qmkyye"}).finish(); + .select(new String[]{"parentorg", "parentorgid", "bank", "bankid", "sonorg", "sonorgid","shkd_nckyye","shkd_qckyye","shkd_bnupamount","shkd_bndownamount", "upamount", "downamount","shkd_subacct","differenceamount","shkd_qmkyye","shkd_zzhkhh"}).finish(); dataSet = dataSet.addField("shkd_bnupamount - shkd_bndownamount", "shkd_bndifferenceamount"); Object statCurrency = ((DynamicObject)paramMap.get("filter_statcurrency")).getPkValue(); dataSet = dataSet.addField(String.valueOf(statCurrency), "currency");