筛选条件优化

magic-boot/src/main/java/org/ssssssss/magicboot/controller/DesignController.java

@@ -47,8 +47,14 @@ public class DesignController {
         CrmRequestUtil crmRequestUtil = new CrmRequestUtil();
         log.info("开始同步设计文件");
 
+        String[] syncStatus = {"option_pending_sync__c", "option_resync__c"};
+
         JSONObject getDesignDoc = crmRequestUtil.getCRMList(Arrays.asList(
-                new Filter("EQ", "name", Arrays.asList("SJWJ250528-0022"))
+                new Filter("IS", "erp_id__c", Arrays.asList("")),
+                new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
+                //new Filter("EQ", "name", Arrays.asList("SJWJ250528-0022")),
+                new Filter("GT", "create_time", Arrays.asList("1748923200000")),
+                new Filter("EQ", "life_status", Arrays.asList("normal"))
         ), "design_file__c");
 
         JSONObject designDocRes = new JSONObject();

magic-boot/src/main/java/org/ssssssss/magicboot/controller/FrameContractController.java

@@ -38,9 +38,12 @@ public class FrameContractController {
     public void syncFrameContract() {
         CrmRequestUtil crmRequestUtil = new CrmRequestUtil();
 
+        String[] syncStatus = {"option_pending_sync__c", "option_resync__c"};
+
         JSONObject frameContract = crmRequestUtil.getCRMList(Arrays.asList(
+                new Filter("IS", "erp_id__c", Arrays.asList("")),
                 new Filter("EQ", "life_status", Arrays.asList("normal")),
-                new Filter("EQ", "sync_status__c", Arrays.asList("option_pending_sync__c")),
+                new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
                 //new Filter("EQ", "name", Arrays.asList("KJ2505200005")),
                 new Filter("GT", "create_time", Arrays.asList("1748923200000"))
         ), "framework_contract__c");

magic-boot/src/main/java/org/ssssssss/magicboot/controller/GoodsPlanController.java

@@ -48,9 +48,12 @@ public class GoodsPlanController {
         CrmRequestUtil crmRequestUtil = new CrmRequestUtil();
         log.info("开始同步要货计划");
 
+        String[] syncStatus = {"option_pending_sync__c", "option_resync__c"};
+
         //要货计划请求
         JSONObject getGoodsPlan = crmRequestUtil.getCRMList(Arrays.asList(
-                new Filter("EQ", "sync_status__c", Arrays.asList("option_pending_sync__c")),
+                new Filter("IS", "erp_id__c", Arrays.asList("")),
+                new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
                 new Filter("GT", "create_time", Arrays.asList("1748923200000")),
                 //new Filter("EQ", "name", Arrays.asList("YHJH20250508-0002")),
                 new Filter("EQ", "life_status", Arrays.asList("normal"))

magic-boot/src/main/java/org/ssssssss/magicboot/controller/InvoiceController.java

@@ -40,8 +40,11 @@ public class InvoiceController {
     public void syncInvoice() {
         CrmRequestUtil crmRequestUtil = new CrmRequestUtil();
 
+        String[] syncStatus = {"option_pending_sync__c", "option_resync__c"};
+
         JSONObject getInvoice = crmRequestUtil.getCRMList(Arrays.asList(
-                new Filter("EQ", "sync_status__c", Arrays.asList("option_pending_sync__c")),
+                new Filter("IS", "erp_id__c", Arrays.asList("")),
+                new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
                 new Filter("EQ", "life_status", Arrays.asList("normal")),
                 //new Filter("EQ", "name", Arrays.asList("20250527-000010"))
                 new Filter("GT", "create_time", Arrays.asList("1748923200000"))

magic-boot/src/main/java/org/ssssssss/magicboot/controller/PreContractController.java

@@ -48,8 +48,11 @@ public class PreContractController {
     public void syncContract() {
         CrmRequestUtil crmRequestUtil = new CrmRequestUtil();
 
+        String[] syncStatus = {"option_pending_sync__c", "option_resync__c"};
+
         JSONObject preContractReq = crmRequestUtil.getCRMList(Arrays.asList(
-                new Filter("EQ", "sync_status__c", Arrays.asList("option_pending_sync__c")),
+                new Filter("IS", "erp_id__c", Arrays.asList("")),
+                new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
                 new Filter("GT", "create_time", Arrays.asList("1748923200000")),
                 //new Filter("EQ", "name", Arrays.asList("YQ2505220005")),
                 new Filter("EQ", "life_status", Arrays.asList("normal"))

magic-boot/src/main/java/org/ssssssss/magicboot/controller/QualityBackController.java

@@ -43,8 +43,11 @@ public class QualityBackController {
 
         log.info("开始同步新建质量反馈单");
 
+        String[] syncStatus = {"option_pending_sync__c", "option_resync__c"};
+
         JSONObject getQualityBack = crmRequestUtil.getCRMList(Arrays.asList(
-                new Filter("EQ", "sync_status__c", Arrays.asList("option_pending_sync__c")),
+                new Filter("IS", "erp_id__c", Arrays.asList("")),
+                new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
                 new Filter("EQ", "life_status", Arrays.asList("normal")),
                 //new Filter("EQ", "name", Arrays.asList("ZLXXFK202505270002")),
                 new Filter("GT", "create_time", Arrays.asList("1748923200000"))

magic-boot/src/main/java/org/ssssssss/magicboot/controller/TenderingController.java

@@ -42,8 +42,11 @@ public class TenderingController {
     public void syncTendering() {
         CrmRequestUtil crmRequestUtil = new CrmRequestUtil();
 
+        String[] syncStatus = {"option_pending_sync__c", "option_resync__c"};
+
         JSONObject getTendering = crmRequestUtil.getCRMList(Arrays.asList(
-                new Filter("EQ", "sync_status__c", Arrays.asList("option_pending_sync__c")),
+                new Filter("IS", "erp_id__c", Arrays.asList("")),
+                new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
                 new Filter("EQ", "life_status", Arrays.asList("normal")),
                 //new Filter("EQ", "name", Arrays.asList("BSGM250509")),
                 new Filter("GT", "create_time", Arrays.asList("1748923200000"))

magic-boot/src/main/java/org/ssssssss/magicboot/controller/XSHTController.java

@@ -47,8 +47,11 @@ public class XSHTController {
     public void syncXSHT() {
         CrmRequestUtil crmRequestUtil = new CrmRequestUtil();
 
+        String[] syncStatus = {"option_pending_sync__c", "option_resync__c"};
+
         JSONObject preContractReq = crmRequestUtil.getCRMList(Arrays.asList(
-                new Filter("EQ", "sync_status__c", Arrays.asList("option_pending_sync__c")),
+                new Filter("IS", "erp_id__c", Arrays.asList("")),
+                new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
                 new Filter("GT", "create_time", Arrays.asList("1748923200000")),
                 //new Filter("EQ", "name", Arrays.asList("ZHY2505280021")),
                 new Filter("EQ", "life_status", Arrays.asList("normal"))
@@ -488,7 +491,8 @@ public class XSHTController {
         CrmRequestUtil crmRequestUtil = new CrmRequestUtil();
 
         JSONObject contractReq = crmRequestUtil.getCRMList(Arrays.asList(
-                new Filter("EQ", "name", Arrays.asList("ZHY2505180013")),
+                //new Filter("EQ", "name", Arrays.asList("ZHY2505180013")),
+                new Filter("GT", "create_time", Arrays.asList("1748923200000")),
                 new Filter("EQ", "is_completed__c", Arrays.asList("yes"))
         ), "SaleContractObj");