From fda3a64e2974ce1d9c95d24d6d014a756687a0bc Mon Sep 17 00:00:00 2001 From: chenshaoxin <1981897232@qq.com> Date: Tue, 29 Apr 2025 10:11:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=99=88?= =?UTF-8?q?=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/4/23=2016?= =?UTF-8?q?=EF=BC=9A30=20=E5=86=85=E5=AE=B9:=E4=B8=8A=E5=88=92=E4=B8=8B?= =?UTF-8?q?=E6=8B=A8=EF=BC=88new=EF=BC=89=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/plugin/report/FinanceReportPlugin.java | 10 +++++----- .../report/FinanceReportfordatePlugin.java | 8 ++++---- .../report/transbillreportnewFormPlugin.java | 16 +++++++++------- .../plugin/report/transbillreportnewPlugin.java | 2 ++ 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportPlugin.java index e6b1c6e..403c8bb 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportPlugin.java @@ -162,11 +162,11 @@ public class FinanceReportPlugin extends AbstractReportListDataPlugin { "(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_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount) end as shkd_oneotnineqx", //1至10合计 - "(shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_jtnbjkamount)/"+selmoney+" as shkd_oneottenje", - "case when (shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_jtnbjkamount)=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_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_jtnbjkamount) end as shkd_oneottenrzcb", - "case when (shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_jtnbjkamount)=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_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount+shkd_jtnbjkamount) end as shkd_oneottenqx", + "(shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount)/"+selmoney+" as shkd_oneottenje", + "case when (shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount)=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_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount) end as shkd_oneottenrzcb", + "case when (shkd_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount)=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_zqrzamount+shkd_dqjkamount+shkd_zcqldamount+shkd_xmdkamount+shkd_rzzlamount+shkd_bxzjrzamount+shkd_yfpjamount+shkd_fjrqyjkamount+shkd_qtzwrzamount) end as shkd_oneottenqx", //11至13合计 "(shkd_yxzamount+shkd_yxxtamount+shkd_qtqyrzamount)/"+selmoney+" as shkd_11to13je", diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordatePlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordatePlugin.java index 31f084d..58a9be5 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordatePlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordatePlugin.java @@ -140,10 +140,10 @@ public class FinanceReportfordatePlugin extends AbstractReportListDataPlugin { "(shkd_zqrzxzhke+shkd_dqjkxzhke+shkd_zcqldxzhke+shkd_xmdkxzhke+shkd_rzzlxzhke+shkd_bxzjrzxzhke+shkd_yfpjxzhke+shkd_fjrqyjkxzhke+shkd_qtzwrzxzhke)/"+selmoney+" as shkd_1to9xzhke", "(shkd_zqrzqmye+shkd_dqjkqmye+shkd_zcqldqmye+shkd_xmdkqmye+shkd_rzzlqmye+shkd_bxzjrzqmye+shkd_yfpjqmye+shkd_fjrqyjkqmye+shkd_qtzwrzqmye)/"+selmoney+" as shkd_1to9qmye", //1至10合计 - "(shkd_zqrzqcye+shkd_dqjkqcye+shkd_zcqldqcye+shkd_xmdkqcye+shkd_rzzlqcye+shkd_bxzjrzqcye+shkd_yfpjqcye+shkd_fjrqyjkqcye+shkd_qtzwrzqcye+shkd_jtnbjkqcye)/"+selmoney+" as shkd_1to10qcye", - "(shkd_zqrzxzrze+shkd_dqjkxzrze+shkd_zcqldxzrze+shkd_xmdkxzrze+shkd_rzzlxzrze+shkd_bxzjrzxzrze+shkd_yfpjxzrze+shkd_fjrqyjkxzrze+shkd_qtzwrzxzrze+shkd_jtnbjkxzrze)/"+selmoney+" as shkd_1to10xzrze", - "(shkd_zqrzxzhke+shkd_dqjkxzhke+shkd_zcqldxzhke+shkd_xmdkxzhke+shkd_rzzlxzhke+shkd_bxzjrzxzhke+shkd_yfpjxzhke+shkd_fjrqyjkxzhke+shkd_qtzwrzxzhke+shkd_jtnbjkxzhke)/"+selmoney+" as shkd_1to10xzhke", - "(shkd_zqrzqmye+shkd_dqjkqmye+shkd_zcqldqmye+shkd_xmdkqmye+shkd_rzzlqmye+shkd_bxzjrzqmye+shkd_yfpjqmye+shkd_fjrqyjkqmye+shkd_qtzwrzqmye+shkd_jtnbjkqmye)/"+selmoney+" as shkd_1to10qmye", + "(shkd_zqrzqcye+shkd_dqjkqcye+shkd_zcqldqcye+shkd_xmdkqcye+shkd_rzzlqcye+shkd_bxzjrzqcye+shkd_yfpjqcye+shkd_fjrqyjkqcye+shkd_qtzwrzqcye)/"+selmoney+" as shkd_1to10qcye", + "(shkd_zqrzxzrze+shkd_dqjkxzrze+shkd_zcqldxzrze+shkd_xmdkxzrze+shkd_rzzlxzrze+shkd_bxzjrzxzrze+shkd_yfpjxzrze+shkd_fjrqyjkxzrze+shkd_qtzwrzxzrze)/"+selmoney+" as shkd_1to10xzrze", + "(shkd_zqrzxzhke+shkd_dqjkxzhke+shkd_zcqldxzhke+shkd_xmdkxzhke+shkd_rzzlxzhke+shkd_bxzjrzxzhke+shkd_yfpjxzhke+shkd_fjrqyjkxzhke+shkd_qtzwrzxzhke)/"+selmoney+" as shkd_1to10xzhke", + "(shkd_zqrzqmye+shkd_dqjkqmye+shkd_zcqldqmye+shkd_xmdkqmye+shkd_rzzlqmye+shkd_bxzjrzqmye+shkd_yfpjqmye+shkd_fjrqyjkqmye+shkd_qtzwrzqmye)/"+selmoney+" as shkd_1to10qmye", //11至13合计 "(shkd_yxzqcye+shkd_yxxtqcye+shkd_qtqyrzqcye)/"+selmoney+" as shkd_11to13qcye", "(shkd_yxzxzrze+shkd_yxxtxzrze+shkd_qtqyrzxzrze)/"+selmoney+" as shkd_11to13xzrze", 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 e7e3dfd..aa6e022 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 @@ -2,6 +2,7 @@ package shkd.sys.sys.plugin.report; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -36,8 +37,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_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"}; + 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","shkd_hightlight"}; + 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","shkd_hightlight"}; @Override public void hyperLinkClick(HyperLinkClickEvent evt) { String field = evt.getFieldName(); @@ -475,11 +476,12 @@ public class transbillreportnewFormPlugin extends AbstractReportFormPlugin imple public void setCellStyleRules(List cellStyleRules) { super.setCellStyleRules(cellStyleRules); CellStyleRule cellStyleRule = new CellStyleRule(); - cellStyleRule.setFieldKey("shkd_qmkyye");// 字段标识 - cellStyleRule.setForeColor("#9a4dff");// 前景色 - cellStyleRule.setBackgroundColor("#9a4dff");// 背景色 - cellStyleRule.setDegree(100);// 透明度 - cellStyleRule.setCondition("shkd_qmkyye <> (shkd_qckyye + differenceamount)");// 前置条件，值与表达式计算器一致 + cellStyleRule.setFieldKey("shkd_qmkyye"); //字段标识 + cellStyleRule.setForeColor("#FF0000"); //前景色 + cellStyleRule.setBackgroundColor("#d9d9d9"); //背景色 + cellStyleRule.setDegree(100); //透明度 + cellStyleRule.setCondition("shkd_hightlight = '1'"); // 前置条件，值与表达式计算器一致 cellStyleRules.add(cellStyleRule); + } } 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 69db92a..8c7685a 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 @@ -121,10 +121,12 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin { 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","shkd_zzhkhh"}).finish(); dataSet = dataSet.addField("shkd_bnupamount - shkd_bndownamount", "shkd_bndifferenceamount"); + dataSet = dataSet.addField("case when shkd_qmkyye<>shkd_qckyye+differenceamount then 1 else 0 end","shkd_hightlight"); Object statCurrency = ((DynamicObject)paramMap.get("filter_statcurrency")).getPkValue(); dataSet = dataSet.addField(String.valueOf(statCurrency), "currency"); return dataSet;