From b3dc8e8ce0a120b4f484ef787abd21832c40ec63 Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期日, 24 四月 2022 10:07:34 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/RetrospectiveWeeklyReportController.cls | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls b/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls
index 4eb57ee..a119ef7 100644
--- a/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls
+++ b/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls
@@ -6,7 +6,7 @@
@AuraEnabled public List<Map<String,String>> doctorList{get;set;}
@AuraEnabled public String UserProType{get;set;}
@AuraEnabled public Map<String,Agency_Report__c> AgencyReportMap{get;set;}
-
+ @AuraEnabled public Map<String,string> PIConfig{get;set;}
public RetrospectiveWeeklyReportController() {
}
@@ -101,6 +101,9 @@
// 瑕嬪嚭銇楄ō瀹�
this.fieldsMap = new Map<String,String>();
this.fieldsMap = this.getfiledsmap();
+
+ this.PIConfig = new Map<String,string>();
+ this.PIConfig.put('staticResourceAgencyContact', JSON.serialize(PIHelper.getPIIntegrationInfo('Agency_Contact__c')));
}
@@ -274,7 +277,9 @@
ret.add(space);
Agency_Hospital_Link__c ahl = [select Hospital__c from Agency_Hospital_Link__c where id = :hospital_id];
- List<Agency_Contact__c> doctor_list = [select id,Name,Doctor_Division1__c,Type__c,Agency_Hospital__c
+ List<Agency_Contact__c> doctor_list = [select id,Name,Doctor_Division1__c,
+ AWS_Data_Id__c,// PI鏀归�� By Bright 20220328
+ Type__c,Agency_Hospital__c
FROM Agency_Contact__c WHERE Hospital_ID18__c=:ahl.Hospital__c order by Name];
for (Agency_Contact__c row : doctor_list)
{
@@ -283,6 +288,7 @@
tmp.put('value', row.Id);
tmp.put('selected', 'false');
tmp.put('Doctor_Division1__c', row.Doctor_Division1__c);
+ tmp.put('AWS_Data_Id__c', row.AWS_Data_Id__c);// PI鏀归�� By Bright 20220328
ret.add(tmp);
}
return ret;
@@ -297,6 +303,8 @@
String UseProduct1, String UseProduct2, String UseProduct3,
String StageName, String oppAmount, String oppOCMPrice, String Close_Forecasted_Date, String Report_Date)
{
+ Department_Cateogy = GetDepartment_Cateogy(Department_Cateogy);
+ system.debug('Department_Cateogy+++'+Department_Cateogy);
Agency_Report__c agency_report = makeAgencyReport(Department_Cateogy,ConsumptionOfConsumables,
WorkMark,warlocksNumber,DealerPersonnel,ProductCcategory,productCategories,WarlockClassification,ProductClassification, WorkRecord,
EffectProgress,Agency_Report_Header,
@@ -370,12 +378,17 @@
//鏂板缓鏂规硶
public static Agency_Report__c insertAgencyReport(Agency_Report__c data) {
if (String.isBlank(data.Hospital__c)) {
+ system.debug('data.Agency_Hospital__c+++'+data.Agency_Hospital__c);
List<Agency_Hospital_Link__c> agency_hospital_link = [select Id, Hospital__c from Agency_Hospital_Link__c where Id=:data.Agency_Hospital__c];
+ system.debug('agency_hospital_link+++'+agency_hospital_link);
data.Hospital__c = agency_hospital_link[0].Hospital__c;
}
if (String.isBlank(data.Department_Class__c)) {
+ system.debug('data.Department_Cateogy__c+++'+data.Department_Cateogy__c);
String record_type_id = LightningUtil.getRecordTypeId(data.Department_Cateogy__c);
+ system.debug('RecordTypeId+++'+record_type_id);
List<Account> account = [select Id, RecordTypeId from account where Hospital_Department_Class__c=:data.Hospital__c and RecordTypeId=:record_type_id];
+ system.debug('account+++'+account);
data.Department_Class__c = account[0].Id;
}
User userPro = LightningUtil.loginUserId();
@@ -1106,22 +1119,37 @@
@RemoteAction
@AuraEnabled
public static List<Map<String,String>> selectProductClassificationc(String select_ProductClassification){
+ //fy
List<FieldClassification__c> WarlockClassificationList;
+ List<AggregateResult> WarlockClassificationList2;
+ User UserProTypec = LightningUtil.loginUserId();
if(String.isNotBlank(select_ProductClassification)){
// WarlockClassificationList = [select id, Name , ProductClassification__c from WarlockClassification__c where ProductClassification__c =: select_ProductClassification];
- WarlockClassificationList = [select id , ProductClassification__c,WarlockClassification__c from FieldClassification__c where ProductClassification__c =: select_ProductClassification];
-
+ if(UserProTypec.UserPro_Type__c =='ET'){
+ WarlockClassificationList = [select id , ProductClassification__c,WarlockClassification__c from FieldClassification__c where ProductClassification__c =: select_ProductClassification];
+ }else{
+ WarlockClassificationList2 = [select count(id) sum, Category4__c from product2 where Category3__c =: select_ProductClassification and ENG_DeaerProFlag__c = true group by Category4__c ];
+ }
}
List<Map<String,String>> options = new List<Map<String,String>>();
Map<String,String> space = new Map<String,String>();
space.put('label', '');
space.put('value', '');
options.add(space);
- 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);
- options.add(WarlockClassificationMap);
+ if(UserProTypec.UserPro_Type__c =='ET'){
+ 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);
+ options.add(WarlockClassificationMap);
+ }
+ }else{
+ for(AggregateResult WarlockClassification2 : WarlockClassificationList2){
+ Map<String,String> WarlockClassificationMap2 = new Map<String,String>();
+ WarlockClassificationMap2.put('label', string.valueOf(WarlockClassification2.get('Category4__c')));
+ WarlockClassificationMap2.put('value', string.valueOf(WarlockClassification2.get('Category4__c')));
+ options.add(WarlockClassificationMap2);
+ }
}
return options;
}
@@ -1154,7 +1182,8 @@
List<FieldClassification__c> productCategoriesList;
User UserProETENG = LightningUtil.loginUserId();
System.debug('UserProETENG.UserPro_Type__c=============>'+UserProETENG.UserPro_Type__c);
- FieldClassification__c fi = [Select ProductCcategory__c from FieldClassification__c where ID =: select_ProductCcategory];
+ System.debug('select_ProductCcategory=============>'+select_ProductCcategory);
+ FieldClassification__c fi = [Select ProductCcategory__c from FieldClassification__c where ProductCcategory__c =: select_ProductCcategory limit 1];
if(UserProETENG.UserPro_Type__c == 'ET'){
productCategoriesList = [select id, productCategories__c,ET_ENG_classification__c,ProductCcategory__c from FieldClassification__c where ProductCcategory__c =: fi.ProductCcategory__c AND ET_ENG_classification__c =: 'ET'];
}else{
--
Gitblit v1.9.1