weiyunlong
/
dobe_comic8
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化OA系统参数,付款申请保证金逻辑优化

This commit is contained in:
weiyunlong 2024-11-29 16:03:10 +08:00
parent 644af72bdb
commit b462c5d631
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/java/shkd/repc/recon/formplugin/PayreqBondFormPlugin.java
View File

@ -49,7 +49,7 @@ public class PayreqBondFormPlugin extends AbstractFormPlugin {
for (DynamicObject qeugBondentry : qeugBondentrys) { for (DynamicObject qeugBondentry : qeugBondentrys) {
Date qeugFinalpaymentdate = qeugBondentry.getDate("qeug_finalpaymentdate");//合同:最终付款日期 Date qeugFinalpaymentdate = qeugBondentry.getDate("qeug_finalpaymentdate");//合同:最终付款日期
// 比较两个日期 // 比较两个日期
if (qeugFinalpaymentdate != null && qeugFinalpaymentamount != null) { if (qeugFinalpaymentdate != null) {
if (qeugFinalpaymentdate.before(qeugFinalpaymentamount)) { if (qeugFinalpaymentdate.before(qeugFinalpaymentamount)) {
System.out.println("保证金最终付款日期早于付款申请的最终支付日期"); System.out.println("保证金最终付款日期早于付款申请的最终支付日期");
bondamount = bondamount.add(qeugBondentry.getBigDecimal("qeug_depositamount"));//合同:保证金金额 bondamount = bondamount.add(qeugBondentry.getBigDecimal("qeug_depositamount"));//合同:保证金金额

6
main/java/shkd/utils/OAUtils.java
View File

@ -28,9 +28,11 @@ import static shkd.repc.resm.opplugin.PushOASupplierOPPlugin.assembleBody;
public class OAUtils { public class OAUtils {
private static final Log logger = LogFactory.getLog(OAUtils.class); 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 = System.getProperty("oaurl");//(测试环境外网地址)http://140.206.96.138:9091
// public static final String oaUrl = "http://172.31.254.240:9090";//本地(内网地址) // public static final String oaUrl = "http://172.31.254.240:9090";//本地(内网地址)
//致远服务前获取token接口 //致远服务前获取token接口
public static String getOaToken(String billNo){ public static String getOaToken(String billNo){
@ -39,8 +41,8 @@ public class OAUtils {
String linkUrl = oaUrl +"/seeyon/rest/token"; String linkUrl = oaUrl +"/seeyon/rest/token";
//接口请求体 //接口请求体
JSONObject linkBody = new JSONObject(); JSONObject linkBody = new JSONObject();
linkBody.put("userName", userName); linkBody.put("userName", System.getProperty("oaUserName"));
linkBody.put("password", password); linkBody.put("password", System.getProperty("oaPassword"));
String token = ""; String token = "";
try { try {