标记为空重发

张宇恒

2023-04-20 d0cf62b4b275dc457cf4b3973a1bce4034bfad4f

标记为空重发

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

@@ -3,8 +3,13 @@
    private String typeNFM;
    private String messageGroupNumber;
    private Datetime times;
    private Boolean isForecast;// 20220318 ljh SWAG-CC54R2 add
    private Boolean isForecast;// 20220318 ljh SWAG-CC54R2 add  
    private String loginId;

     //20230203 lt 计划的作业优化  一小时两次 start
     private BatchEmailUtil.ScBean scB1;
     //20230203 lt 计划的作业优化  一小时两次 end

    /**
     * コンスタント
     */
@@ -38,6 +43,16 @@
     */
    public Integer max_cnt = Integer.valueOf(System.Label.batch_retry_max_cnt);
    global Database.QueryLocator start(Database.BatchableContext BC) {

        //20230203 lt 计划的作业优化  一小时两次 start
        scB1 = BatchEmailUtil.setSc1('LogAutoSendSchedule', 0, 23, 0, '0 30 *', null);
        if (System.Test.isRunningTest() == false) {
            for(CronTrigger ct : [SELECT Id FROM CronTrigger WHERE CronJobDetail.Name =: scB1.scName]) {
                System.abortJob(ct.Id);
            }
            system.schedule(scB1.scName, scB1.scTime, new LogAutoSendSchedule());
        }
        //20230203 lt 计划的作业优化  一小时两次 end

        String profileId = UserInfo.getProfileId();
        // 20220318 ljh SWAG-CC54R2 add start
@@ -101,12 +116,15 @@
                 retry_cnt__c, NFM501Future_Count__c, NFM501_Web_Annex_Count__c
                 FROM BatchIF_Log__c
                 WHERE RowDataFlg__c = true
                 // AND Unexecuted__c > 0 // 2023-4-10   ZYH   ADD
                                         AND Type__c != 'NFM007'  // 2023-01-18   ZYH   ADD
                                        AND ((retry_cnt__c != null AND retry_cnt__c > 0 AND retry_cnt__c < : max_cnt)
                                            OR (NFM501Future_Count__c != null
                                                AND NFM501Future_Count__c > 0 AND NFM501Future_Count__c < : max_cnt)
                                            OR(NFM501_Web_Annex_Count__c != null
                                               AND NFM501_Web_Annex_Count__c > 0 AND NFM501_Web_Annex_Count__c < : max_cnt))]
                                               AND NFM501_Web_Annex_Count__c > 0 AND NFM501_Web_Annex_Count__c < : max_cnt)
                                            OR Unexecuted__c > 0 // 2023-4-10   ZYH   ADD
                                            )]
                );
        }else {
            return Database.getQueryLocator(
@@ -115,12 +133,15 @@
                 retry_cnt__c, NFM501Future_Count__c, NFM501_Web_Annex_Count__c
                 FROM BatchIF_Log__c
                 WHERE RowDataFlg__c = true
                 // AND Unexecuted__c > 0 // 2023-4-10   ZYH   ADD
                                         AND Type__c != 'NFM007'  // 2023-01-18   ZYH   ADD
                                        AND ((retry_cnt__c != null AND retry_cnt__c > 0 AND retry_cnt__c < : max_cnt)
                                            OR (NFM501Future_Count__c != null
                                                AND NFM501Future_Count__c > 0 AND NFM501Future_Count__c < : max_cnt)
                                            OR(NFM501_Web_Annex_Count__c != null
                                               AND NFM501_Web_Annex_Count__c > 0 AND NFM501_Web_Annex_Count__c < : max_cnt))
                                               AND NFM501_Web_Annex_Count__c > 0 AND NFM501_Web_Annex_Count__c < : max_cnt)
                                            OR Unexecuted__c > 0 // 2023-4-10   ZYH   ADD
                                            )
                                       AND ownerId = : UserInfo.getUserId()
                                       ORDER BY CreatedDate // 2023-02-04   ZYH   ADD
                                       ]
@@ -248,6 +269,11 @@
            if (strType_c == 'NFM207') {
                NFM207Controller.execute(rowData, null);
            }
            // 贸易合规 you 20230321 start
            if (strType_c == 'NFM209') {
                NFM209Rest.main(rowData.Id);
            }
            // 贸易合规 you 20230321  end
            if (strType_c == 'NFM009') {
                NFM009Controller.execute(rowData, null);
            }
@@ -302,6 +328,11 @@
            if (strType_c == 'NFM612') {
                NFM612Rest.main(rowData.Id);
            }
            // 2023-3-6   zyh   add   报修子单发送接口测试用
            if (strType_c == 'NFM612S') {
                NFM612Controller.ManualExecute(rowData.Id);
            }
            // 2023-3-6   zyh   add   报修子单发送接口测试用
            if (strType_c == 'NFM620') {
                NFM620Rest.main(rowData.Id);
            }
@@ -519,6 +550,8 @@
    }

    global void finish(Database.BatchableContext BC) {
        BatchEmailUtil.removeOtherSc('LogAutoSendSchedule', scB1.scName);  //20230203 lt 计划的作业优化

        // 今回はやることないです
        // 20220318 ljh SWAG-CC54R2 add start
        if(String.isNotBlank(typeNFM) && typeNFM == 'NFM010' && isForecast){