diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/api/PayBillApiSavePlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/api/PayBillApiSavePlugin.java index 21a08e0..5dc30c5 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/api/PayBillApiSavePlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/api/PayBillApiSavePlugin.java @@ -488,16 +488,13 @@ public class PayBillApiSavePlugin implements ApiSavePlugin { if ("bd_supplier".equals(payeetype)) { logger.info("收款人类型 → 供应商"); Map societycreditcode = new HashMap<>(); - societycreditcode.put("societycreditcode", map.get("payeenumber").toString()); + societycreditcode.put("societycreditcode", map.get("payeenumber")); map.put("shkd_supplier", societycreditcode); logger.info("收款人ID:{}", map.get("payeenumber")); DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype.toString(), "id," + - "number,name,societycreditcode,shkd_xknumber,entry_bank,entry_bank.bankaccount,entry_bank.accountname," + - "entry_bank.bank", - new QFilter("societycreditcode", QCP.equals, map.get("payeenumber").toString()) - .or("shkd_xknumber", QCP.equals, map.get("payeenumber").toString()) - .or("name", QCP.equals, map.get("payeename").toString()).toArray()); + "number,name,societycreditcode,shkd_xknumber,entry_bank,entry_bank.bankaccount,entry_bank.accountname,entry_bank.bank", + new QFilter("societycreditcode", QCP.equals, map.get("payeenumber")).toArray()); if (objects.length > 0) { DynamicObjectCollection dynamicObjectCollection = objects[0].getDynamicObjectCollection("entry_bank"); @@ -512,11 +509,13 @@ public class PayBillApiSavePlugin implements ApiSavePlugin { } else if ("bd_customer".equals(payeetype)) { logger.info("收款人类型 → 客户"); Map societycreditcode = new HashMap<>(); - societycreditcode.put("societycreditcode", map.get("payeenumber").toString()); + societycreditcode.put("societycreditcode", map.get("payeenumber")); map.put("shkd_customer", societycreditcode); logger.info("收款人ID:{}", map.get("payeenumber")); - DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype.toString(), "id,number,name,societycreditcode,entry_bank,entry_bank.bankaccount,entry_bank.accountname,entry_bank.bank", new QFilter("societycreditcode", QCP.equals, map.get("payeenumber").toString()).toArray()); + DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype.toString(), + "id,number,name,societycreditcode,entry_bank,entry_bank.bankaccount,entry_bank.accountname,entry_bank.bank", + new QFilter("societycreditcode", QCP.equals, map.get("payeenumber")).toArray()); if (objects.length > 0) { DynamicObjectCollection dynamicObjectCollection = objects[0].getDynamicObjectCollection("entry_bank"); @@ -530,10 +529,10 @@ public class PayBillApiSavePlugin implements ApiSavePlugin { } else if ("bos_user".equals(payeetype)) { logger.info("收款人类型 → 人员"); Map user_number = new HashMap<>(); - user_number.put("number", map.get("payeenumber").toString()); + user_number.put("number", map.get("payeenumber")); logger.info("收款人编码:{}", map.get("payeenumber")); map.put("shkd_user", user_number); - DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype.toString(), "id,name,number,username", new QFilter("number", QCP.equals, map.get("payeenumber").toString()).toArray()); + DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype.toString(), "id,name,number,username", new QFilter("number", QCP.equals, map.get("payeenumber")).toArray()); logger.info("人员查询,通过人员工号查对应的人员数据长度:{}", objects.length); if (objects.length > 0) { // 收款人编码 @@ -543,10 +542,10 @@ public class PayBillApiSavePlugin implements ApiSavePlugin { } } else if ("bos_org".equals(payeetype)) { Map number = new HashMap<>(); - number.put("number", map.get("payeenumber").toString()); + number.put("number", map.get("payeenumber")); map.put("shkd_org", number); - DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype.toString(), "id,number,name,", new QFilter("number", QCP.equals, map.get("payeenumber").toString()).toArray()); + DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype.toString(), "id,number,name,", new QFilter("number", QCP.equals, map.get("payeenumber")).toArray()); if (objects.length > 0) { // 收款人编码 map.put("payeenumber", objects[0].getString("number")); @@ -630,10 +629,10 @@ public class PayBillApiSavePlugin implements ApiSavePlugin { map.put(fieldName2, payerbank); Map number = new HashMap<>(); - number.put("number", map.get("payeenumber").toString()); + number.put("number", map.get("payeenumber")); map.put("shkd_org", number); - DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype.toString(), "id,number,name,", new QFilter("number", QCP.equals, map.get("payeenumber").toString()).toArray()); + DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype.toString(), "id,number,name,", new QFilter("number", QCP.equals, map.get("payeenumber")).toArray()); if (objects.length > 0) { // 收款人编码 map.put("payeenumber", objects[0].getString("number")); @@ -716,10 +715,10 @@ public class PayBillApiSavePlugin implements ApiSavePlugin { map.put(fieldName2, payerbank); Map number = new HashMap<>(); - number.put("number", map.get("payeenumber").toString()); + number.put("number", map.get("payeenumber")); map.put("shkd_org", number); - DynamicObject[] objects = BusinessDataServiceHelper.load("bos_org", "id,number,name,", new QFilter("number", QCP.equals, map.get("payeenumber").toString()).toArray()); + DynamicObject[] objects = BusinessDataServiceHelper.load("bos_org", "id,number,name,", new QFilter("number", QCP.equals, map.get("payeenumber")).toArray()); if (objects.length > 0) { logger.info("收款人查询长度 → " + objects.length); // 收款人ID