From 2160f8579f0db101c121229da3b7de4bd7e0e357 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 11 三月 2022 17:37:47 +0800
Subject: [PATCH] Revert "追溯周报的Controller和LightningUtil"
---
force-app/main/default/classes/RetrospectiveWeeklyReportController.cls | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls b/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls
index 4eb57ee..2a4ae4a 100644
--- a/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls
+++ b/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls
@@ -214,7 +214,6 @@
agency_report_header = LightningUtil.upsertAgencyReportHeader(agency_report_header);
return agency_report_header.Id;
}
- //鏂板缓鍛ㄦ姤涓�瑙�
public static Agency_Report_Header__c makeReportHeader(String name, String s_date, String s_agency, String head_key){
User login_user_id = LightningUtil.loginUserId();
Date week = Date.valueOf(s_date);
@@ -904,19 +903,19 @@
}
}
if(EffectProgressMap.containsKey(lineList[12])){
- agencyReport.EffectProgress__c = EffectProgressMap.get(lineList[12]).EffectProgress__c;
+ agencyReport.EffectProgress__c = EffectProgressMap.get(lineList[12]).Id;
}
if(lineList[13] != null){
agencyReport.ConsumptionOfConsumables__c = Decimal.valueOf(lineList[13]);
}
if(OtherBrandConsumablesMap.containsKey(lineList[14])){
- agencyReport.WarlockClassification__c = OtherBrandConsumablesMap.get(lineList[14]).WarlockClassification__c;
+ agencyReport.WarlockClassification__c = OtherBrandConsumablesMap.get(lineList[14]).Id;
}
if(ProductCcategorynMap.containsKey(lineList[15])){
- agencyReport.ProductCcategory__c = ProductCcategorynMap.get(lineList[15]).ProductCcategory__c;
+ agencyReport.ProductCcategory__c = ProductCcategorynMap.get(lineList[15]).Id;
}
if(productCategoriesMap.containsKey(lineList[16])){
- agencyReport.productCategories__c = productCategoriesMap.get(lineList[16]).productCategories__c;
+ agencyReport.productCategories__c = productCategoriesMap.get(lineList[16]).Id;
}
if(lineList[17] != null){
agencyReport.warlocksNumber__c = Decimal.valueOf(lineList[17]);
@@ -1097,7 +1096,7 @@
for(FieldClassification__c efptc : eftpcList){
Map<String,String> efptcMap = new Map<String,String>();
efptcMap.put('label', efptc.EffectProgress__c);
- efptcMap.put('value', efptc.EffectProgress__c);
+ efptcMap.put('value', efptc.Id);
options.add(efptcMap);
}
system.debug('options===============>'+options);
@@ -1120,7 +1119,7 @@
for(FieldClassification__c WarlockClassification : WarlockClassificationList){
Map<String,String> WarlockClassificationMap = new Map<String,String>();
WarlockClassificationMap.put('label', WarlockClassification.WarlockClassification__c);
- WarlockClassificationMap.put('value', WarlockClassification.WarlockClassification__c);
+ WarlockClassificationMap.put('value', WarlockClassification.Id);
options.add(WarlockClassificationMap);
}
return options;
@@ -1143,7 +1142,7 @@
for(FieldClassification__c ProductCcategory : ProductCcategoryList){
Map<String,String> ProductCcategorynMap = new Map<String,String>();
ProductCcategorynMap.put('label', ProductCcategory.ProductCcategory__c);
- ProductCcategorynMap.put('value', ProductCcategory.ProductCcategory__c);
+ ProductCcategorynMap.put('value', ProductCcategory.Id);
options.add(ProductCcategorynMap);
}
return options;
@@ -1168,7 +1167,7 @@
for(FieldClassification__c productCategories : productCategoriesList){
Map<String,String> productCategoriesMap = new Map<String,String>();
productCategoriesMap.put('label', productCategories.productCategories__c);
- productCategoriesMap.put('value', productCategories.productCategories__c);
+ productCategoriesMap.put('value', productCategories.Id);
options.add(productCategoriesMap);
}
System.debug('options=============>'+options);
--
Gitblit v1.9.1