yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
lihao 2025-04-15 13:53:35 +08:00
parent d5c85788d9 81e4b92880
commit 83db7d650b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmp/src/client/nccloud/web/cmp/informer/informer/action/myBtnClickAction.java
View File

@ -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<Map<String, String>> results = (List<Map<String, String>>) 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"));

1
fbm/src/client/nccloud/web/fbm/fbm/gather/action/DzButton.java
View File

@ -18,6 +18,7 @@ import java.time.format.DateTimeFormatter;
import java.util.*;
/**
* 收票登记-到账通知推送按钮
* 2005ÊÊÅä2312
*
* @author mzr