gzw 测试环境代码更新

高章伟

2023-03-03 d8dc84a3d56df839895f1c417a4d9cbee763d262

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

@@ -142,6 +142,24 @@
                from User where Id IN: userIDs All ROWS
            ];
            System.debug(Logginglevel.DEBUG, 'NFM621_ userList.size()=' + userList.size());

            //20220824 you LLIU-CHL8FB start 向智慧医疗传输用户本部
            SS_BatchColumnMapping__c DeptMapping = SS_BatchColumnMapping__c.getValues('User_Salesdepartment_To_NFM621__c');
                      
                Map<String,String> SalesdepartmentMap = new Map<String,String>();
                for (Integer i = 1; i <= 30; i++) {
                    String lpadI = ('00' + i).right(3);
                    String fromColumn = 'From_Column_' + lpadI + '__c';
                    if(DeptMapping!=null){
                        String apiStr = String.valueOf(DeptMapping.get(fromColumn));
                        if (String.isBlank(apiStr) == false) {
                            String ssColumn = 'SS_Column_' + lpadI + '__c';
                            String ssApiStr = String.valueOf(DeptMapping.get(ssColumn));
                            SalesdepartmentMap.put(apiStr,ssApiStr);   
                        }
                    }      
             } 
            //20220824 you LLIU-CHL8FB end
            // GeDatasのデータの設定
            for (User user1: userList) {
                GeData info = new GeData();
@@ -153,7 +171,14 @@
                info.OnlinePlatformBuchang = user1.OnlinePlatformBuchang__r.Employee_No__c; //部长(共通平台)
                info.ZongjianApprovalManager = user1.ZongjianApprovalManager__r.Employee_No__c; //总监(共通平台) 
                info.FederationIdentifier = user1.FederationIdentifier; //联盟ID
                info.BusinessDivision = user1.Salesdepartment__c; //本部
                //20220824 you LLIU-CHL8FB start 
                if(null!=SalesdepartmentMap && SalesdepartmentMap.containsKey(user1.Salesdepartment__c)){
                   info.BusinessDivision = SalesdepartmentMap.get(user1.Salesdepartment__c);//本部
                 }else{
                   info.BusinessDivision = user1.Salesdepartment__c;//本部
                 }
                //info.BusinessDivision = user1.Salesdepartment__c; //本部
                //20220824 you LLIU-CHL8FB end 
                info.Department = user1.Category5__c; //部
                info.GroupDep = user1.Category6__c; //课
                info.State = user1.Province__c; //省
@@ -268,7 +293,10 @@
            if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0;
            if (rowData.retry_cnt__c < batch_retry_max_cnt) {
                rowData.retry_cnt__c++;
                LogAutoSendSchedule.assignOneMinute();
                if(!Test.isRunningTest()){
                    LogAutoSendSchedule.assignOneMinute();
                }
                
            }
            if (rowData.retry_cnt__c >= batch_retry_max_cnt) {
                rowData.ErrorLog__c = ex.getMessage() + '\n' + ex.getStackTraceString() + '\n' + rowData.ErrorLog__c + '错误次数已经超过自动送信设定的最大次数，请手动送信';