From afd416e4b5ca9c5a812e75a8d26935cd998a20a1 Mon Sep 17 00:00:00 2001 From: weiyunlong Date: Thu, 3 Apr 2025 16:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=20=201.=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20--s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/StrongSharingQueryPlugin.java | 36 +++++++++---------- .../fi/fi/webapi/ApplyBillControler.java | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/report/StrongSharingQueryPlugin.java b/main/java/shjh/jhzj7/fi/fi/plugin/report/StrongSharingQueryPlugin.java index 778f35f..fccdb1a 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/report/StrongSharingQueryPlugin.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/report/StrongSharingQueryPlugin.java @@ -72,15 +72,15 @@ public class StrongSharingQueryPlugin extends AbstractReportListDataPlugin imple .finish(); // 再次根据银行编码分组 求和余额 - DataSet finish1 = result.groupBy(new String[]{"banknumber"}).sum("shjh_amountjz").finish(); + result1 = result.groupBy(new String[]{"shjh_orgnumber", "shjh_orgname", "shjh_bankname","banknumber"}).sum("shjh_amountjz").finish(); - // 分组后和源集合联表:除银行编码,余额的其他字段进行组合返回前台 - result1 = result.join(finish1) - .on("banknumber","banknumber") - .on("shjh_amountjz","shjh_amountjz") - .select(new String[]{"shjh_billno", "shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber", - "shjh_biztime", "shjh_amountjz","accountbankid"}) - .finish(); +// // 分组后和源集合联表:除银行编码,余额的其他字段进行组合返回前台 +// result1 = result.join(finish1) +// .on("banknumber","banknumber") +// .on("shjh_amountjz","shjh_amountjz") +// .select(new String[]{"shjh_billno", "shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber", +// "shjh_biztime", "shjh_amountjz","accountbankid"}) +// .finish(); } catch (Exception e) { e.printStackTrace(); @@ -140,15 +140,15 @@ public class StrongSharingQueryPlugin extends AbstractReportListDataPlugin imple .finish(); // 再次根据银行编码分组 求和余额 - DataSet finish1 = result.groupBy(new String[]{"banknumber"}).sum("shjh_amounttn").finish(); + result2 = result.groupBy(new String[]{"shjh_orgnumber", "shjh_orgname", "shjh_bankname","banknumber"}).sum("shjh_amounttn").finish(); - // 分组后和源集合联表:除银行编码,余额的其他字段进行组合返回前台 - result2 = result.join(finish1) - .on("banknumber","banknumber") - .on("shjh_amounttn","shjh_amounttn") - .select(new String[]{"shjh_billno", "shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber", - "shjh_biztime", "shjh_amounttn","accountbankid"}) - .finish(); +// // 分组后和源集合联表:除银行编码,余额的其他字段进行组合返回前台 +// result2 = result.join(finish1) +// .on("banknumber","banknumber") +// .on("shjh_amounttn","shjh_amounttn") +// .select(new String[]{"shjh_billno", "shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber", +// "shjh_biztime", "shjh_amounttn","accountbankid"}) +// .finish(); } catch (Exception e) { e.printStackTrace(); @@ -177,8 +177,8 @@ public class StrongSharingQueryPlugin extends AbstractReportListDataPlugin imple .on("shjh_orgname", "shjh_orgname") .on("shjh_bankname", "shjh_bankname") .on("shjh_orgnumber", "shjh_orgnumber") - .select(new String[]{"shjh_billno", "shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber", - "shjh_biztime", "shjh_amountjz", "shjh_amounttn"}) + .select(new String[]{"shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber", + "shjh_amountjz", "shjh_amounttn"}) .finish(); finalResult.print(true); diff --git a/main/java/shjh/jhzj7/fi/fi/webapi/ApplyBillControler.java b/main/java/shjh/jhzj7/fi/fi/webapi/ApplyBillControler.java index 3cb7837..6aa5ceb 100644 --- a/main/java/shjh/jhzj7/fi/fi/webapi/ApplyBillControler.java +++ b/main/java/shjh/jhzj7/fi/fi/webapi/ApplyBillControler.java @@ -297,7 +297,7 @@ public class ApplyBillControler { handleError("同步失败,费控单据编号:" + fkBillNum + "的结算方式为空", fkBillNum, Apimenthod,jsonBodyString); return handleErrorAndReturn(apiResultExt,"结算方式为空"); } - QFilter Q6 = new QFilter("name", QCP.equals, settlementtype); + QFilter Q6 = new QFilter("number", QCP.equals, settlementtype); DynamicObject settlement = BusinessDataServiceHelper.loadSingle(BD_SETTLEMENTTYPE, new QFilter[]{Q6}); if (null == settlement) { handleError("同步失败,费控单据编号:" + fkBillNum + "的结算方式不存在", fkBillNum, Apimenthod,jsonBodyString);