同步代码

黄千龙

2023-03-08 962519811b7c4be07f30d09e791798b0ea79d3ae

 force-app/main/default/classes/NFM603Controller.cls

@@ -485,7 +485,7 @@
            logstr += '\nend';
            if (repairs.size() > 0) {
                // 2022-05-05      zyh     update      start
                for (RepairOrderInfo roi : repairs ) {
                /*for (RepairOrderInfo roi : repairs ) {
                    repairs1.add(roi);
                    rowData = NFMUtil.makeRowData(iflog, LOG_TYPE, repairs1);
                    // 2022-05-07  zyh     update  start
@@ -497,7 +497,31 @@
                    // rowData = NFMUtil.makeRowData(iflog, LOG_TYPE, repairs);
                    // execute(rowData, iflog);
                    repairs1 = new List < RepairOrderInfo > ();
                }
                }// 2022-08-19   zyh  小程序异步处理，恢复批量发送
                */  // 2023-02-02   zyh   五个一批推送小程序   注释上方for循环
                // 2023-02-02   zyh   五个一批推送小程序   start
                for (Integer i=1;  i <= repairs.size();i++ ) {
                    if(Math.mod(i, 5) > 0 ){
                        repairs1.add(repairs[i-1]);
                        if(i == repairs.size()){
                            rowData = NFMUtil.makeRowData(iflog, LOG_TYPE, repairs1);
                            if (String.isBlank(rowData.MessageGroupNumber__c)) {
                                rowData.MessageGroupNumber__c = nowStr;
                            }
                            execute1(rowData, iflog);
                        }
                    }else{
                        repairs1.add(repairs[i-1]);
                        rowData = NFMUtil.makeRowData(iflog, LOG_TYPE, repairs1);
                        if (String.isBlank(rowData.MessageGroupNumber__c)) {
                            rowData.MessageGroupNumber__c = nowStr;
                        }
                        execute1(rowData, iflog);
                        repairs1 = new List < RepairOrderInfo > ();
                    }
                    
                } 
                // 2023-02-02   zyh   五个一批推送小程序   end
                upsert logList;
                upsert rowList;
                // 2022-05-11  zyh     update start
@@ -580,8 +604,8 @@
                    rowDataSFDC.retry_cnt__c++;
                    // 20230201 ljh start 
                    // LogAutoSendSchedule.logId = rowDataSFDC.Id;
                    // LogAutoSendSchedule.assignOneMinute();
                    LogAutoSendSchedule.assignOneMinute(rowDataSFDC.MessageGroupNumber__c,rowDataSFDC.Type__c);
                    LogAutoSendSchedule.assignOneMinute();
                    // LogAutoSendSchedule.assignOneMinute(rowDataSFDC.MessageGroupNumber__c,rowDataSFDC.Type__c);
                    // 20230201 ljh  end 
                }
                if (rowDataSFDC.retry_cnt__c >= batch_retry_max_cnt) {
@@ -605,8 +629,8 @@
                    rowDataSFDC.retry_cnt__c++;
                    // 20230201 ljh start 
                    // LogAutoSendSchedule.logId = rowDataSFDC.Id;
                    // LogAutoSendSchedule.assignOneMinute();
                    LogAutoSendSchedule.assignOneMinute(rowDataSFDC.MessageGroupNumber__c,rowDataSFDC.Type__c);
                    LogAutoSendSchedule.assignOneMinute();
                    // LogAutoSendSchedule.assignOneMinute(rowDataSFDC.MessageGroupNumber__c,rowDataSFDC.Type__c);
                    // 20230201 ljh  end
                }
                if (rowDataSFDC.retry_cnt__c >= batch_retry_max_cnt){
@@ -667,8 +691,8 @@
                    rowDataSFDC.retry_cnt__c++;
                    // 20230201 ljh start 
                    // LogAutoSendSchedule.logId = rowDataSFDC.Id;
                    // LogAutoSendSchedule.assignOneMinute();
                    LogAutoSendSchedule.assignOneMinute(rowDataSFDC.MessageGroupNumber__c,rowDataSFDC.Type__c);
                    LogAutoSendSchedule.assignOneMinute();
                    // LogAutoSendSchedule.assignOneMinute(rowDataSFDC.MessageGroupNumber__c,rowDataSFDC.Type__c);
                    // 20230201 ljh  end
                }
                if (rowDataSFDC.retry_cnt__c >= batch_retry_max_cnt) {
@@ -692,8 +716,8 @@
                    rowDataSFDC.retry_cnt__c++;
                    // 20230201 ljh start 
                    // LogAutoSendSchedule.logId = rowDataSFDC.Id;
                    // LogAutoSendSchedule.assignOneMinute();
                    LogAutoSendSchedule.assignOneMinute(rowDataSFDC.MessageGroupNumber__c,rowDataSFDC.Type__c);
                    LogAutoSendSchedule.assignOneMinute();
                    // LogAutoSendSchedule.assignOneMinute(rowDataSFDC.MessageGroupNumber__c,rowDataSFDC.Type__c);
                    // 20230201 ljh  end
                }
                if (rowDataSFDC.retry_cnt__c >= batch_retry_max_cnt){