合同点检报告书页面调整及课题同步

zhangzhengmei

2023-08-06 68ec9682be0289965f7e1494a7f7082a64576048

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

@@ -358,6 +358,20 @@
            }

            List < Inspection_Report__c > queryIrs = [select Id, RecordType.DeveloperName, RecordType.Name, Name, Status__c, Inspection_StartTime__c, Inspection_EndTime__c, Contract__c,
            //zzm 230727 add start
            Department_Leakage_Frequency__c
            ,Original_Leakage_Device__c
            ,Leakage_Status__c
            ,Disinfectant_type__c
            ,Cleaning_Solution_Brand__c
            ,Disinfection_Method__c
            ,Escrow__c
            ,Third_Party_Maintenance__c
            ,CustomerSuggestion__c
            ,Agency__c
            ,Agency_Contact_Id__c,
            //zzm 230727 add end
            
            //add by rentx 
            Disinfectant__c, UsedMachine__c, SterilizationMethod__c, Used_ET__c, Others__c, CleaningFluid__c,Inspectup_Plan__c,Mode__c from Inspection_Report__c where Id = :pReportId];
            if (queryIrs.size() <= 0) {
@@ -535,6 +549,7 @@
        this.settingSoql = 'select Id, Name, Name_Manual__c, Next_StartHour_Page__c, Next_StartMinute_Page__c ';
        this.settingSoql += ',Next_EndHour_Page__c, Next_EndMinute_Page__c,Disinfectant__c ,UsedMachine__c ,SterilizationMethod__c ,Used_ET__c, Mode__c ';
        this.settingSoql += ',Others__c, Remarks__c, CleaningFluid__c  ';
        this.settingSoql += ',Department_Leakage_Frequency__c,Original_Leakage_Device__c,Leakage_Status__c,Disinfectant_type__c,Cleaning_Solution_Brand__c,Disinfection_Method__c,Escrow__c,Third_Party_Maintenance__c,CustomerSuggestion__c,Agency__c,Agency_Contact_Id__c ';
        // 重複な項目を追加しないためのセット
        Set < String > apiTempSet = new Set < String > ();
        apiTempSet.add('Id');
@@ -545,6 +560,18 @@
        apiTempSet.add('Next_EndHour_Page__c');
        apiTempSet.add('Next_EndMinute_Page__c');

        apiTempSet.add('Department_Leakage_Frequency__c');
        apiTempSet.add('Original_Leakage_Device__c');
        apiTempSet.add('Leakage_Status__c');
        apiTempSet.add('Disinfectant_type__c');
        apiTempSet.add('Cleaning_Solution_Brand__c');
        apiTempSet.add('Disinfection_Method__c');
        apiTempSet.add('Escrow__c');
        apiTempSet.add('Third_Party_Maintenance__c');
        apiTempSet.add('CustomerSuggestion__c');
        apiTempSet.add('Agency__c');
        apiTempSet.add('Agency_Contact_Id__c');

        for (List < String > apiList: sectionApiList) {
            for (String apiStr: apiList) {
                if (String.isBlank(apiStr) == false && apiTempSet.contains(apiStr) == false) {