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-05 15:25:41 +08:00
parent 90ccbac340
commit 2291fc6148
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/management/controller/PastContractController.java
View File

@ -117,12 +117,14 @@ public class PastContractController {
e.printStackTrace(); e.printStackTrace();
} }
if (!"success".equals(projectRes.getString("errorDescription")) || projectRes.getJSONObject("data").getJSONArray("dataList").isEmpty()) { String projectCode = "";
log.info("项目号不存在，将不再向下执行");
continue;
}
String projectCode = projectRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0).getString("opportunity_id__c"); //判断项目编号如果为空，则赋值项目编号
if ("success".equals(projectRes.getString("errorDescription")) && !projectRes.getJSONObject("data").getJSONArray("dataList").isEmpty()) {
log.info("项目号不存在，将不再向下执行");
projectCode = projectRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0).getString("opportunity_id__c");
}
//合同种类 //合同种类
String contractType = contractData.getString("contract_zl__c") != null ? contractData.getString("contract_zl__c") : ""; String contractType = contractData.getString("contract_zl__c") != null ? contractData.getString("contract_zl__c") : "";

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

@ -654,7 +654,7 @@ public class PreContractController {
Map erpContractReq = new HashMap<>(); Map erpContractReq = new HashMap<>();
erpContractReq.put("billno", preContractData.getString("name"));//预签合同编号 erpContractReq.put("billno", preContractData.getString("name"));//预签合同编号
erpContractReq.put("crmid", preContractData.getString("_id"));//CRM唯一性编码 erpContractReq.put("crmid", preContractData.getString("_id"));//CRM唯一性编码
erpContractReq.put("project_number", preContractData.getString("opportunity_id__c"));//项目号 erpContractReq.put("project_number", preContractData.getString("opportunity_id__c") != null ? preContractData.getString("opportunity_id__c") : "");//项目号
//erpContractReq.put("project_number", "SJ20250424-0033");//项目号 //erpContractReq.put("project_number", "SJ20250424-0033");//项目号
erpContractReq.put("billtype_number", "conm_salcontract_BT_YQ");//单据类型 erpContractReq.put("billtype_number", "conm_salcontract_BT_YQ");//单据类型
erpContractReq.put("billname", preContractData.getString("project_name__c") != null ? preContractData.getString("project_name__c") : "预签合同");//合同名称 erpContractReq.put("billname", preContractData.getString("project_name__c") != null ? preContractData.getString("project_name__c") : "预签合同");//合同名称