weiloong_zhang/zhyManagement
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对部分内容做了优化

Browse Source
This commit is contained in:
itzhang 2025-07-02 17:21:29 +08:00
parent f4e5898b6c
commit 90512198cf
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/management/controller/FrameContractController.java
View File

@ -221,7 +221,7 @@ public class FrameContractController {
JSONObject customerData = customerRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0); JSONObject customerData = customerRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0);
frameContractReqMap.put("customer_number", customerData.getString("account_no"));//合同单位名称 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("customer_number", "Cus-000007");//todo 合同单位名称
frameContractReqMap.put("settlecustomer_number", frameContractData.getString("billing_customer_code__c") != null ? frameContractData.getString("billing_customer_code__c") : "");//结算客户 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") : "");//付款客户 frameContractReqMap.put("payingcustomer_number", frameContractData.getString("payment_customer_code__c") != null ? frameContractData.getString("payment_customer_code__c") : "");//付款客户

2
src/main/java/com/management/controller/PreContractController.java
View File

@ -209,7 +209,7 @@ public class PreContractController {
JSONObject customerData = customerRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0); JSONObject customerData = customerRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0);
erpContractReq.put("customer_number", customerData.getString("account_no"));//合同单位名称 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("customer_number", "Cus-000007");//todo 合同单位名称
erpContractReq.put("settlecustomer_number", preContractData.getString("billing_customer_code__c") != null ? preContractData.getString("billing_customer_code__c") : "");//结算客户 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") : "");//付款客户 erpContractReq.put("payingcustomer_number", preContractData.getString("payment_customer_code__c") != null ? preContractData.getString("payment_customer_code__c") : "");//付款客户

15
src/main/java/com/management/controller/TenderingController.java
View File

@ -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 backReq = crmRequestUtil.updateCRM(backReqMap);
JSONObject backRes = new JSONObject(); JSONObject backRes = new JSONObject();