From 2291fc61489c95324160be6feccdd4ecfc037ffb Mon Sep 17 00:00:00 2001 From: itzhang <2019326567@qq.com> Date: Sat, 5 Jul 2025 15:25:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=9F=E5=88=9D=E5=92=8C=E5=90=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PastContractController.java | 12 +++++++----- .../management/controller/PreContractController.java | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/management/controller/PastContractController.java b/src/main/java/com/management/controller/PastContractController.java index 68daac9..ed8bcd8 100644 --- a/src/main/java/com/management/controller/PastContractController.java +++ b/src/main/java/com/management/controller/PastContractController.java @@ -117,12 +117,14 @@ public class PastContractController { e.printStackTrace(); } - if (!"success".equals(projectRes.getString("errorDescription")) || projectRes.getJSONObject("data").getJSONArray("dataList").isEmpty()) { - log.info("项目号不存在，将不再向下执行"); - continue; - } + String projectCode = ""; - 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") : ""; diff --git a/src/main/java/com/management/controller/PreContractController.java b/src/main/java/com/management/controller/PreContractController.java index 2c19023..556ceaa 100644 --- a/src/main/java/com/management/controller/PreContractController.java +++ b/src/main/java/com/management/controller/PreContractController.java @@ -654,7 +654,7 @@ public class PreContractController { Map erpContractReq = new HashMap<>(); erpContractReq.put("billno", preContractData.getString("name"));//预签合同编号 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("billtype_number", "conm_salcontract_BT_YQ");//单据类型 erpContractReq.put("billname", preContractData.getString("project_name__c") != null ? preContractData.getString("project_name__c") : "预签合同");//合同名称