From 962519811b7c4be07f30d09e791798b0ea79d3ae Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:54:02 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/classes/RentalApplySequenceController.cls | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/RentalApplySequenceController.cls b/force-app/main/default/classes/RentalApplySequenceController.cls
index 978eff5..1123ad1 100644
--- a/force-app/main/default/classes/RentalApplySequenceController.cls
+++ b/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()));
--
Gitblit v1.9.1