From f8dd3a9d8cbdf6c5cf61937c69b07c0ed3988a4b Mon Sep 17 00:00:00 2001 From: itzhang <2019326567@qq.com> Date: Sat, 5 Jul 2025 15:58:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/management/controller/PastContractController.java | 2 +- src/main/java/com/management/tzcontroller/TZXSHTController.java | 1 + src/main/java/com/management/tzcontroller/YQHTController.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/management/controller/PastContractController.java b/src/main/java/com/management/controller/PastContractController.java index ed8bcd8..80fb984 100644 --- a/src/main/java/com/management/controller/PastContractController.java +++ b/src/main/java/com/management/controller/PastContractController.java @@ -304,7 +304,7 @@ public class PastContractController { //款到发货 Boolean delivery = null; - switch (contractData.getString("ship_on_payment_received__c")) { + switch (contractData.getString("ship_on_payment_received__c") != null ? contractData.getString("ship_on_payment_received__c") : "") { case "yes": delivery = true; break; diff --git a/src/main/java/com/management/tzcontroller/TZXSHTController.java b/src/main/java/com/management/tzcontroller/TZXSHTController.java index a199a83..ea974dc 100644 --- a/src/main/java/com/management/tzcontroller/TZXSHTController.java +++ b/src/main/java/com/management/tzcontroller/TZXSHTController.java @@ -45,6 +45,7 @@ public class TZXSHTController { JSONObject salesOrderReq = crmRequestUtil.getCRMList(Arrays.asList( new Filter("GT", "last_modified_time", Arrays.asList("1748923200000")), new Filter("EQ", "life_status", Arrays.asList("normal")), + new Filter("N", "is_initial__c", Arrays.asList("true")), //new Filter("EQ", "name", Arrays.asList("ZHY2505260018")), new Filter("IN", "ledger_sync_status__c", Arrays.asList(syncStatus)) ), "SaleContractObj"); diff --git a/src/main/java/com/management/tzcontroller/YQHTController.java b/src/main/java/com/management/tzcontroller/YQHTController.java index c288642..faef6fe 100644 --- a/src/main/java/com/management/tzcontroller/YQHTController.java +++ b/src/main/java/com/management/tzcontroller/YQHTController.java @@ -46,6 +46,7 @@ public class YQHTController { new Filter("GT", "last_modified_time", Arrays.asList("1748923200000")), new Filter("EQ", "life_status", Arrays.asList("normal")), //new Filter("EQ", "name", Arrays.asList("YQ2505260006")), + new Filter("N", "is_initial__c", Arrays.asList("true")), new Filter("IN", "ledger_sync_status__c", Arrays.asList(syncStatus)) ), "pre_signed_contract__c");