黄千龙
2023-03-08 962519811b7c4be07f30d09e791798b0ea79d3ae
force-app/main/default/classes/DirectAssignController.cls
@@ -24,14 +24,16 @@
      // 暂定分配数据指定给对象有的情况
      targetId = ApexPages.currentPage().getParameters().get('targetId');
      if(String.isNotEmpty(recordId)){
         raesd = [SELECT Id,Fixture_Model_No_text__c,Asset__c,Rental_Apply__r.Name,Rental_Apply_Equipment_Set__r.Name,
         List<Rental_Apply_Equipment_Set_Detail__c> TempList = [SELECT Id,Fixture_Model_No_text__c,Asset__c,Rental_Apply__r.Name,Rental_Apply_Equipment_Set__r.Name,
               Queue_Day__c,Queue_Number__c,Rental_Apply__r.WorkPlace__c,Rental_Apply__r.Person_In_Charge__r.Name,
               Rental_Apply__r.demo_purpose2__c,Queue_Conment__c,Equipment_Type_text__c,Salesdepartment_before__c,
               Internal_asset_location_before__c,jumpReason__c,Queue_User__r.Name,Rental_Apply__r.Hospital__r.Name,Rental_Apply__c,
               Rental_Apply__r.Campaign__r.Name,Externalkey__c,Rental_Apply__r.Internal_asset_location_F__c,QuenType__c
               Rental_Apply__r.Campaign__r.Name,Externalkey__c,Rental_Apply__r.Internal_asset_location_F__c,QuenType__c,Rental_Apply_Object__r.Name ,Rental_Apply_Object__r.WorkPlace__c ,Rental_Apply_Object__r.Person_In_Charge__r.Name
               ,Rental_Apply_Object__r.demo_purpose2__c,Rental_Apply_Object__r.Id
                FROM Rental_Apply_Equipment_Set_Detail__c 
                WHERE Is_Body__c=true 
                AND Rental_Apply_Equipment_Set__c=:recordId limit 1];
         raesd = TempList[0];
         assetId = raesd.Asset__c; 
         String soql = null;
         if (String.isNotEmpty(targetId)) {
@@ -40,6 +42,7 @@
                     + 'Queue_Day__c,Queue_Number__c,Rental_Apply__r.WorkPlace__c,Rental_Apply__r.Person_In_Charge__r.Name,jumpReason__c,'
                     + 'Rental_Apply__r.demo_purpose2__c,Queue_Conment__c,Equipment_Type_text__c,ExternalKey__c,Allow_Adjust_Queue_Flag__c,'
                     + 'Queue_User__r.Name,Rental_Apply__r.Hospital__r.Name,Rental_Apply__r.Campaign__r.Name,Salesdepartment_before__c,Internal_asset_location_before__c'
                     + ',Rental_Apply_Object__r.Name ,Rental_Apply_Object__r.WorkPlace__c ,Rental_Apply_Object__r.Person_In_Charge__r.Name ,Rental_Apply_Object__r.demo_purpose2__c,Rental_Apply_Object__r.Id'
                     + ' FROM Rental_Apply_Equipment_Set_Detail__c' 
                     + ' WHERE Is_Body__c=true '
                     + ' AND Rental_Apply_Equipment_Set__c =:targetId';
@@ -53,6 +56,7 @@
                     + 'Queue_Day__c,Queue_Number__c,Rental_Apply__r.WorkPlace__c,Rental_Apply__r.Person_In_Charge__r.Name,jumpReason__c,'
                     + 'Rental_Apply__r.demo_purpose2__c,Queue_Conment__c,Equipment_Type_text__c,ExternalKey__c,Allow_Adjust_Queue_Flag__c,'
                     + 'Queue_User__r.Name,Rental_Apply__r.Hospital__r.Name,Rental_Apply__r.Campaign__r.Name,Salesdepartment_before__c,Internal_asset_location_before__c'
                     + ',Rental_Apply_Object__r.Name ,Rental_Apply_Object__r.WorkPlace__c ,Rental_Apply_Object__r.Person_In_Charge__r.Name ,Rental_Apply_Object__r.demo_purpose2__c,Rental_Apply_Object__r.Id'
                     + ' FROM Rental_Apply_Equipment_Set_Detail__c' 
                     + ' WHERE Is_Body__c=true '
                     + ' AND Queue_Number__c > 0'