同步代码

黄千龙

2023-03-08 962519811b7c4be07f30d09e791798b0ea79d3ae

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

@@ -204,8 +204,9 @@
        if(String.isNotBlank(S_ApplyBenBu)){
            // Modify by Liu 20220908 Solution本部课题对应 start
            //List<String> benbuList = S_ApplyBenBu.split(',');
            List<String> benbuList = S_ApplyBenBu.replace('16.Solution本部', '16.消化·呼吸领域解决方案本部').split(',');
            List<String> benbuList = S_ApplyBenBu.replace('16.Solution本部', '16.Solution本部').split(',');
            // Modify by Liu 20220908 Solution本部课题对应 end
            //List<String> benbuList = S_ApplyBenBu.split(',');
            benbuSet.addAll(benbuList);
        }
        // 办事处
@@ -309,11 +310,12 @@
        soql += ' Salesdepartment_before__c,Equipment_Type_text__c,Product_category_text__c ,';
        soql += ' Rental_Apply_Equipment_Set__r.QueueShippmentDateNew__c,';
        soql += ' Rental_Apply__r.Salesdepartment_text__c,Rental_Apply__r.Internal_asset_location_F__c,Internal_asset_location_before__c, ';
        soql += ' Rental_Apply__r.WorkPlace__c,Rental_Apply__r.Person_In_Charge__c ,Queue_Number__c ';
        soql += ' Rental_Apply__r.WorkPlace__c,Rental_Apply__r.Person_In_Charge__c ,Queue_Number__c, Rental_Apply_Object__r.WorkPlace__c, Rental_Apply_Object__r.Person_In_Charge__c ';
        soql += ' ,Rental_Apply_Object__r.Salesdepartment_text__c ,Rental_Apply_Object__r.Name ';
        soql += '  from Rental_Apply_Equipment_Set_Detail__c ';
        soql += ' where Cancel_Select__c = false  and  Queue_Number__c > 0 ';
        if(String.isNotBlank(SraName)){
            soql += ' and Rental_Apply__r.Name like \'%'+SraName+'%\'';
            soql += ' and Rental_Apply_Object__r.Name like \'%'+SraName+'%\'';
        }
        if(String.isNotBlank(SFixture_Model_No)){
            // soql += ' and Fixture_Model_No__c = :SFixture_Model_No';
@@ -323,7 +325,7 @@
        // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, 'zheli00:' + SRa_Person));
        if(SRa_Person.Person_In_Charge__c != null){
            String tempId = SRa_Person.Person_In_Charge__c;
            soql += ' and Rental_Apply__r.Person_In_Charge__c = :tempId';
            soql += ' and Rental_Apply_Object__r.Person_In_Charge__c = :tempId';
        }
        // String pdBenBu
        if(String.isNotBlank(pdBenBu)){
@@ -336,11 +338,11 @@
        }
        // Set<String> benbuApplySet
        if(benbuApplySet.size() > 0){
            soql += ' and Rental_Apply__r.Salesdepartment_text__c IN :benbuApplySet';
            soql += ' and Rental_Apply_Object__r.Salesdepartment_text__c IN :benbuApplySet';
        }
        // Set<String> applyAgencySet
        if(applyAgencySet.size() > 0){
            soql += ' and Rental_Apply__r.WorkPlace__c IN :applyAgencySet';
            soql += ' and Rental_Apply_Object__r.WorkPlace__c IN :applyAgencySet';
        }
        // Set<String> pdBeiPinFenLei
        // if(pdBeiPinFenLei.size() > 0){
@@ -394,6 +396,7 @@
        // if(String.isNotBlank(S_bieCunFangDi)){
            for (SelectOption op : opList) {
                if (String.isNotBlank(op.getValue())) {
                    ApplyBenBu.add(new CustomData(op.getValue(),op.getValue()));
                    // Modify by Liu 20220908 Solution本部课题对应 start
                    //ApplyBenBu.add(new CustomData(op.getValue(),op.getValue()));
                    ApplyBenBu.add(new CustomData(op.getValue(),op.getLabel()));