diff --git a/main/java/shkd/repc/recon/formplugin/PayreqBondFormPlugin.java b/main/java/shkd/repc/recon/formplugin/PayreqBondFormPlugin.java index f3afa50..628eb83 100644 --- a/main/java/shkd/repc/recon/formplugin/PayreqBondFormPlugin.java +++ b/main/java/shkd/repc/recon/formplugin/PayreqBondFormPlugin.java @@ -49,7 +49,7 @@ public class PayreqBondFormPlugin extends AbstractFormPlugin { for (DynamicObject qeugBondentry : qeugBondentrys) { Date qeugFinalpaymentdate = qeugBondentry.getDate("qeug_finalpaymentdate");//合同:最终付款日期 // 比较两个日期 - if (qeugFinalpaymentdate != null && qeugFinalpaymentamount != null) { + if (qeugFinalpaymentdate != null) { if (qeugFinalpaymentdate.before(qeugFinalpaymentamount)) { System.out.println("保证金最终付款日期早于付款申请的最终支付日期"); bondamount = bondamount.add(qeugBondentry.getBigDecimal("qeug_depositamount"));//合同:保证金金额 diff --git a/main/java/shkd/utils/OAUtils.java b/main/java/shkd/utils/OAUtils.java index 8c09008..8adf8a7 100644 --- a/main/java/shkd/utils/OAUtils.java +++ b/main/java/shkd/utils/OAUtils.java @@ -28,9 +28,11 @@ import static shkd.repc.resm.opplugin.PushOASupplierOPPlugin.assembleBody; public class OAUtils { private static final Log logger = LogFactory.getLog(OAUtils.class); +// public static final String oaUrl = "https://newoa.dobechina.com";//(正式环境外网地址) public static final String oaUrl = System.getProperty("oaurl");//(测试环境外网地址)http://140.206.96.138:9091 // public static final String oaUrl = "http://172.31.254.240:9090";//本地(内网地址) + //致远服务前获取token接口 public static String getOaToken(String billNo){ @@ -39,8 +41,8 @@ public class OAUtils { String linkUrl = oaUrl +"/seeyon/rest/token"; //接口请求体 JSONObject linkBody = new JSONObject(); - linkBody.put("userName", userName); - linkBody.put("password", password); + linkBody.put("userName", System.getProperty("oaUserName")); + linkBody.put("password", System.getProperty("oaPassword")); String token = ""; try {