From 81e4b92880c7f305f58c4586a1f6d3b90312fb34 Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 15 Apr 2025 11:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A6=E6=8E=A8=E9=80=81=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/cmp/informer/informer/action/myBtnClickAction.java | 5 +++-- .../client/nccloud/web/fbm/fbm/gather/action/DzButton.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmp/src/client/nccloud/web/cmp/informer/informer/action/myBtnClickAction.java b/cmp/src/client/nccloud/web/cmp/informer/informer/action/myBtnClickAction.java index 1420beb..20eab06 100644 --- a/cmp/src/client/nccloud/web/cmp/informer/informer/action/myBtnClickAction.java +++ b/cmp/src/client/nccloud/web/cmp/informer/informer/action/myBtnClickAction.java @@ -157,7 +157,7 @@ public class myBtnClickAction extends InformerAction implements ICommonAction { System.out.println(url); // 获取当前年份 - String sql = " select jstype.code as pk_balatype,ban.code bancode,ban.name as banname,bankname,bank.accnum as accnum,infodate,CASE direction " + + String sql = " select bz.code as nzcode,jstype.code as pk_balatype,ban.code bancode,ban.name as banname,bankname,bank.accnum as accnum,infodate,CASE direction " + "WHEN 'paymoney' THEN '付款' " + "WHEN 'receivemoney' THEN '收款' " + "ELSE '不存在' " + @@ -172,6 +172,7 @@ public class myBtnClickAction extends InformerAction implements ICommonAction { "left join bd_cust_supplier df on cmp.pk_oppunit=df.pk_cust_sup " + "left join org_financeorg org on cmp.pk_org = org.pk_financeorg " + "left join bd_balatype jstype on jstype.pk_balatype =cmp.pk_balatype " + + "left join bd_currtype bz on cmp.pk_currtype=bz.pk_currtype"+ " where cmp.pk_informer in(" + result + ") "; List> results = (List>) getQueryService().executeQuery(sql, new MapListProcessor()); @@ -210,7 +211,7 @@ public class myBtnClickAction extends InformerAction implements ICommonAction { vmao.put("bankNum", row.get("accnum")); vmao.put("transactionDate", row.get("infodate")); vmao.put("paymentReceiptStatus", row.get("direction")); - vmao.put("currencyCode", "CNY"); + vmao.put("currencyCode", row.get("nzcode") ); vmao.put("transactionAmount", row.get("moneyy")); vmao.put("pendingClaimAmount", 0); vmao.put("oppAccount", row.get("oppbankaccount")); diff --git a/fbm/src/client/nccloud/web/fbm/fbm/gather/action/DzButton.java b/fbm/src/client/nccloud/web/fbm/fbm/gather/action/DzButton.java index c8ea0e5..426ebcf 100644 --- a/fbm/src/client/nccloud/web/fbm/fbm/gather/action/DzButton.java +++ b/fbm/src/client/nccloud/web/fbm/fbm/gather/action/DzButton.java @@ -18,6 +18,7 @@ import java.time.format.DateTimeFormatter; import java.util.*; /** + * 收票登记-到账通知推送按钮 * 2005适配2312 * * @author mzr