From 90512198cf2065243a2ff2fd4514c5e40d957796 Mon Sep 17 00:00:00 2001 From: itzhang <2019326567@qq.com> Date: Wed, 2 Jul 2025 17:21:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=81=9A=E4=BA=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FrameContractController.java | 2 +- .../controller/PreContractController.java | 2 +- .../controller/TenderingController.java | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/management/controller/FrameContractController.java b/src/main/java/com/management/controller/FrameContractController.java index eea419e..259131f 100644 --- a/src/main/java/com/management/controller/FrameContractController.java +++ b/src/main/java/com/management/controller/FrameContractController.java @@ -221,7 +221,7 @@ public class FrameContractController { JSONObject customerData = customerRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0); frameContractReqMap.put("customer_number", customerData.getString("account_no"));//合同单位名称 - frameContractReqMap.put("reccustomer_number", customerData.getString("account_no"));//收获客户单位名称 + frameContractReqMap.put("reccustomer_number", frameContractData.getString("gain_customer__c"));//收获客户单位名称 //frameContractReqMap.put("customer_number", "Cus-000007");//todo 合同单位名称 frameContractReqMap.put("settlecustomer_number", frameContractData.getString("billing_customer_code__c") != null ? frameContractData.getString("billing_customer_code__c") : "");//结算客户 frameContractReqMap.put("payingcustomer_number", frameContractData.getString("payment_customer_code__c") != null ? frameContractData.getString("payment_customer_code__c") : "");//付款客户 diff --git a/src/main/java/com/management/controller/PreContractController.java b/src/main/java/com/management/controller/PreContractController.java index 73d8a34..821a818 100644 --- a/src/main/java/com/management/controller/PreContractController.java +++ b/src/main/java/com/management/controller/PreContractController.java @@ -209,7 +209,7 @@ public class PreContractController { JSONObject customerData = customerRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0); erpContractReq.put("customer_number", customerData.getString("account_no"));//合同单位名称 - erpContractReq.put("reccustomer_number", customerData.getString("account_no"));//收获客户单位名称 + erpContractReq.put("reccustomer_number", preContractData.getString("referenced_field__c"));//收获客户单位名称 //erpContractReq.put("customer_number", "Cus-000007");//todo 合同单位名称 erpContractReq.put("settlecustomer_number", preContractData.getString("billing_customer_code__c") != null ? preContractData.getString("billing_customer_code__c") : "");//结算客户 erpContractReq.put("payingcustomer_number", preContractData.getString("payment_customer_code__c") != null ? preContractData.getString("payment_customer_code__c") : "");//付款客户 diff --git a/src/main/java/com/management/controller/TenderingController.java b/src/main/java/com/management/controller/TenderingController.java index 8c91362..a26e503 100644 --- a/src/main/java/com/management/controller/TenderingController.java +++ b/src/main/java/com/management/controller/TenderingController.java @@ -217,6 +217,21 @@ public class TenderingController { } //开始回写 + //解锁 + if ("1".equals(tenderingData.getString("lock_status"))) { + log.info("解锁"); + JSONObject unlockReq = crmRequestUtil.unlockCRM(tenderingId, "framework_contract__c"); + + JSONObject unlockRes = new JSONObject(); + + try { + unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println(unlockRes); + } + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); JSONObject backRes = new JSONObject();