合同优化

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;

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");

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");