From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/RetrospectiveWeeklyReportController.cls | 1584 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 1,307 insertions(+), 277 deletions(-)
diff --git a/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls b/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls
index 4eb57ee..3b33f2b 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() {
}
@@ -67,7 +67,7 @@
// 绉戝鍒嗙被 Department_Cateogy__c AgencyReportMap
this.allselectlist.put('Department_Cateogy__c', RetrospectiveWeeklyReportController.getPicklistValues('Agency_Report__c','Department_Cateogy__c'));
- // 宸ヤ綔璁板綍浼� WorkRecord__c
+ // 娲诲姩鍖哄垎浼� WorkRecord__c
this.allselectlist.put('WorkRecord__c', RetrospectiveWeeklyReportController.getPicklistValues('Agency_Report__c','WorkRecord__c'));
// 鏁堟灉杩涘害 EffectProgress__c
@@ -77,7 +77,7 @@
// if(login_user_id.UserPro_Type__c == 'ET')
this.allselectlist.put('ProductClassification__c', RetrospectiveWeeklyReportController.getPicklistValues1('Agency_Report__c','ProductClassification__c'));
- // 绉戝鍚岀被鑰楁潗鏈堜娇鐢ㄩ噺 ConsumptionOfConsumables__c
+ // 浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺 ConsumptionOfConsumables__c
this.allselectlist.put('ConsumptionOfConsumables__c', RetrospectiveWeeklyReportController.getPicklistValues('Agency_Report__c','ConsumptionOfConsumables__c'));
//闃舵 StageName__c
@@ -97,13 +97,26 @@
//浜у搧绫诲埆
this.allselectlist.put('WorkMark__c', RetrospectiveWeeklyReportController.getPicklistValues('Agency_Report__c','WorkMark__c'));
-
+ //鎷滆浜�
+ // //fy 20220414
+ // this.allselectlist.put('doctor3__c', RetrospectiveWeeklyReportController.getPicklistValues('Agency_Report__c','doctor3__c'));
// 瑕嬪嚭銇楄ō瀹�
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')));
}
-
+ @RemoteAction
+ @AuraEnabled
+ public static List<Map<String,String>> selectdoctor3c(){
+
+ List<Map<String,String>> options = new List<Map<String,String>>();
+ options = RetrospectiveWeeklyReportController.getPicklistValues('Agency_Report__c','doctor3__c');
+
+ return options;
+ }
public static List<Map<String,String>> getPicklistValues(String objstr, String fld){
List<Map<String,String>> options = new List<Map<String,String>>();
Map<String,String> space = new Map<String,String>();
@@ -147,14 +160,14 @@
if (!a.isActive()) continue;
Map<String,String> ses = new Map<String,String>();
if(fag){
- if(a.getValue() != '鑵硅厰闀滄墜鏈�'){
+ if(a.getValue() != '鑵硅厰闀滄墜鏈�'&&a.getValue() != '寮�鑵规墜鏈�'){
ses.put('label', a.getLabel());
ses.put('value', a.getValue());
ses.put('selected', 'false');
options.add(ses);
}
- }else{
- if(a.getValue() == '鑵硅厰闀滄墜鏈�'){
+ }else{//fy 20220414
+ if(a.getValue() == '鑵硅厰闀滄墜鏈�'||a.getValue() == '寮�鑵规墜鏈�'){
ses.put('label', a.getLabel());
ses.put('value', a.getValue());
ses.put('selected', 'false');
@@ -180,7 +193,7 @@
lab = dfield.getLabel();
mappingmap.put(dfield.name,lab);
}
- // Agency_Report__c 鍛ㄦ姤鏄庣粏
+ // Agency_Report__c 鏃ユ姤鏄庣粏
fieldMap = schemaMap.get('Agency_Report__c').getDescribe().fields.getMap();
for(Schema.SObjectField sfield : fieldMap.Values())
{
@@ -203,8 +216,8 @@
@RemoteAction
@AuraEnabled
- public static ProductTypes__c getProduct(String id){
- return [select Department_Cateogy__c, OPD_Flg__c, Id, SIS_Flg__c from ProductTypes__c where Id =:id];
+ public static ProductTypes__c getProduct(String id){//fy 淇敼Department_Cateogy_text__c
+ return [select Department_Cateogy__c,Department_Cateogy_text__c, OPD_Flg__c, Id, SIS_Flg__c from ProductTypes__c where Id =:id];
}
@RemoteAction
@@ -214,7 +227,7 @@
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);
@@ -258,7 +271,31 @@
@AuraEnabled
public static List<Product2> getUseProduct1(String UseProduct1Name,String select_ProductClassification) {
String UseProduct1Name01 = '%' + UseProduct1Name.trim() + '%';
- List<Product2> Product2List = [select Id, Name from Product2 where Category3__c =: select_ProductClassification AND Name like :UseProduct1Name01];
+ User UserProTypec = LightningUtil.loginUserId();
+ List<Product2> Product2List=new List<Product2>();
+ List<String> select_ProductClassificationList = new List<String>();
+ if(select_ProductClassification=='鍏朵粬'){
+ select_ProductClassificationList.add('鍩哄共');
+ select_ProductClassificationList.add('妯″瀷');
+ select_ProductClassificationList.add('鍏朵粬');
+ select_ProductClassificationList.add('鍏朵粬ET');
+ select_ProductClassificationList.add('澶栫ET');
+ select_ProductClassificationList.add('闄勫睘鍝�');
+ }else if(select_ProductClassification=='鍛煎惛绉�'){
+ select_ProductClassificationList.add('鍛煎惛绉慐T');
+ }else{
+ select_ProductClassificationList.add(select_ProductClassification);
+ }
+ if(UserProTypec.UserPro_Type__c == 'ET'){
+ Product2List = [select Id, Name ,Asset_Model_No__c from Product2 where Category3__c in: select_ProductClassificationList AND Asset_Model_No__c like :UseProduct1Name01 AND Dealer_Object__c = true AND Estimation_Entry_Possibility__c = '鈼�'];
+ }else{
+ Product2List = [select Id, Name,Asset_Model_No__c from Product2 where Category3__c in: select_ProductClassificationList AND Category4__c='Thunderbeat' AND Asset_Model_No__c like :UseProduct1Name01 AND ENG_DeaerProFlag__c = true AND Estimation_Entry_Possibility__c = '鈼�'];
+ }
+ // if(UserProTypec.UserPro_Type__c == 'ET'){
+ // Product2List = [select Id, Name ,Asset_Model_No__c from Product2 where Category3__c =: select_ProductClassification AND Asset_Model_No__c like :UseProduct1Name01 AND Dealer_Object__c = true AND Estimation_Entry_Possibility__c = '鈼�'];
+ // }else{
+ // Product2List = [select Id, Name,Asset_Model_No__c from Product2 where Category3__c =: select_ProductClassification AND Category4__c='Thunderbeat' AND Asset_Model_No__c like :UseProduct1Name01 AND ENG_DeaerProFlag__c = true AND Estimation_Entry_Possibility__c = '鈼�'];
+ // }
return Product2List;
}
@@ -274,7 +311,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,9 +322,27 @@
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;
+ }
+ //鍒犻櫎鍛ㄦ姤鏄庣粏
+ @RemoteAction
+ @AuraEnabled
+ public static String deleteAgencyReport(String agencyReport_id){
+ Savepoint sp = Database.setSavepoint();
+ try{
+ System.debug('agencyReport_id'+agencyReport_id);
+ Agency_Report__c arrays = new Agency_Report__c();
+ arrays.Id=agencyReport_id;
+ delete arrays;
+ return 'success';
+ }catch(Exception e){
+ Database.rollback(sp);
+ System.debug('exception'+e);
+ return e.getLineNumber()+'exception'+e;
+ }
}
@RemoteAction
@@ -297,6 +354,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('Agency_Report_Header+++'+Agency_Report_Header);
Agency_Report__c agency_report = makeAgencyReport(Department_Cateogy,ConsumptionOfConsumables,
WorkMark,warlocksNumber,DealerPersonnel,ProductCcategory,productCategories,WarlockClassification,ProductClassification, WorkRecord,
EffectProgress,Agency_Report_Header,
@@ -339,12 +398,26 @@
} else {
agency_report.DealerPersonnel__c = null;
}
- //鏇存柊缁忛攢鍟嗗尰闄㈢殑 鏈�杩戝懆鎶ヨ窡鏂版棩 ,
+ //鏇存柊缁忛攢鍟嗗尰闄㈢殑 鏈�杩戞棩鎶ヨ窡鏂版棩 ,
if (Agency_Hospital != '') {
LightningUtil.updateAccMaxActivityDate(Agency_Hospital, week);
}
- if (doctor != '') { agency_report.doctor2__c = doctor; } else { agency_report.doctor2__c = null; }
- if (Department_Cateogy != '') { agency_report.Department_Cateogy__c = Department_Cateogy; }
+ //fy 20220414
+ if (doctor != '') {
+ if(WorkRecord == '绉戝浼�'){
+ agency_report.doctor3__c = doctor;
+ }else{
+ agency_report.doctor2__c = doctor;
+ }
+ }else {
+ if(WorkRecord == '绉戝浼�'){
+ agency_report.doctor3__c = null;
+ }else{
+ agency_report.doctor2__c = null;
+ }
+ }
+ // if (Department_Cateogy != '') { agency_report.Department_Cateogy__c = Department_Cateogy; }
+ if (Department_Cateogy != '') { agency_report.Department_Cateogy_text__c = Department_Cateogy; }
if (ConsumptionOfConsumables != null) { agency_report.ConsumptionOfConsumables__c = ConsumptionOfConsumables; }
if (WorkRecord != '') { agency_report.WorkRecord__c = WorkRecord; }
// system.debug('EffectProgress==================>'+EffectProgress);
@@ -370,14 +443,19 @@
//鏂板缓鏂规硶
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)) {
- String record_type_id = LightningUtil.getRecordTypeId(data.Department_Cateogy__c);
- List<Account> account = [select Id, RecordTypeId from account where Hospital_Department_Class__c=:data.Hospital__c and RecordTypeId=:record_type_id];
- data.Department_Class__c = account[0].Id;
- }
+ // 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();
data.WeeklyReportClassification__c = userPro.UserPro_Type__c;
system.debug('data==================>'+data);
@@ -397,10 +475,10 @@
{
if (String.isBlank(Agency_Report_Id)) {
return null;
- }
- Agency_Report__c agency_report = [select Id, Name, Department_Cateogy__c, ConsumptionOfConsumables__c, WorkRecord__c,WarlockClassification__c,
+ }//fy Department_Cateogy_text__c
+ Agency_Report__c agency_report = [select Id,Hospital__c, Name, Department_Cateogy__c,Department_Cateogy_text__c, ConsumptionOfConsumables__c, WorkRecord__c,WarlockClassification__c,
ProductCcategory__c, productCategories__c,warlocksNumber__c,WorkMark__c,ProductClassification__c,DealerPersonnel__c, Agency_Report_Header__c,Agency_Hospital__c,UseProduct1__c,
- UseProduct2__c, UseProduct3__c, Person_In_Charge2__c,doctor2__c,Submit_date__c,Report_Date__c
+ UseProduct2__c, UseProduct3__c, Person_In_Charge2__c,doctor2__c,doctor3__c,Submit_date__c,Report_Date__c
from Agency_Report__c where id=:Agency_Report_Id];
Date week = Date.valueOf(Submit_date);
agency_report.Submit_date__c = week;
@@ -426,8 +504,21 @@
LightningUtil.updateAccMaxActivityDate(Agency_Hospital, week);
}
// WRITE Agency Report__c String EffectProgress, ConsumptionOfConsumables__c WorkMark__c,warlocksNumber__c,
- if (doctor != '') { agency_report.doctor2__c = doctor; } else { agency_report.doctor2__c = null; }
- if (Department_Cateogy != '') { agency_report.Department_Cateogy__c = Department_Cateogy; } else { agency_report.Department_Cateogy__c = null; }
+ if (doctor != '') {
+ if(WorkRecord == '绉戝浼�'){
+ agency_report.doctor3__c = doctor;
+ }else{
+ agency_report.doctor2__c = doctor;
+ }
+ } else {
+ if(WorkRecord == '绉戝浼�'){
+ agency_report.doctor3__c = null;
+ }else{
+ agency_report.doctor2__c = null;
+ }
+ }
+ // if (Department_Cateogy != '') { agency_report.Department_Cateogy__c = Department_Cateogy; } else { agency_report.Department_Cateogy__c = null; }
+ if (Department_Cateogy != '') { agency_report.Department_Cateogy_text__c = Department_Cateogy; } else { agency_report.Department_Cateogy_text__c = null; }
if (WorkRecord != '') { agency_report.WorkRecord__c = WorkRecord; } else { agency_report.WorkRecord__c = null; }
if (ConsumptionOfConsumables != null) { agency_report.ConsumptionOfConsumables__c = ConsumptionOfConsumables; } else { agency_report.ConsumptionOfConsumables__c = null; }
if (EffectProgress != '') { agency_report.EffectProgress__c = EffectProgress; } else { agency_report.EffectProgress__c = null; }
@@ -441,11 +532,23 @@
if (WarlockClassification != '') { agency_report.WarlockClassification__c = WarlockClassification; } else { agency_report.WarlockClassification__c = null; }
if (WorkMark != false) { agency_report.WorkMark__c = WorkMark; } else { agency_report.WorkMark__c = false; }
if (warlocksNumber != null) { agency_report.warlocksNumber__c = warlocksNumber; } else { agency_report.warlocksNumber__c = null; }
- agency_report = LightningUtil.updateAgencyReport(agency_report);
+ //fy 20220414
+ // agency_report = LightningUtil.updateAgencyReport(agency_report);
+ agency_report = updateAgencyReport(agency_report);
return agency_report.Id;
}
-
+ //fy 20220414
+ public static Agency_Report__c updateAgencyReport(Agency_Report__c data) {
+ system.debug('data.Agency_Hospital__c++'+data.Agency_Hospital__c);
+ system.debug('data.Id++'+data.Id);
+ if (String.isBlank(data.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];
+ data.Hospital__c = agency_hospital_link[0].Hospital__c;
+ }
+ update data;
+ return data;
+ }
@RemoteAction
@AuraEnabled
public static List<Agency_Opportunity__c> selectOpportunityByIdAndHospitalLinkId(String opportunity_id, String agency_hospital_link_id) {
@@ -479,7 +582,7 @@
return ret;
}
- // 鎵归噺娣诲姞鍛ㄦ姤by vivek start
+ // 鎵归噺娣诲姞鏃ユ姤by vivek start
@RemoteAction
@AuraEnabled
public static List<Agency_Report__c> getReportsByDate(String date1, String date2) {
@@ -494,14 +597,79 @@
String login_user_id = UserInfo.getUserId();
return [select id, Name, Agency_User__c from contact];
}
-
+ // fy 瀵煎叆 20220506 start
+ @AuraEnabled
+ public static String processDataAWSId(String fileData) {
+ System.debug('fileData:::'+filedata);
+ String errorMag = '';
+ // 鍒涘缓鏃ユ姤
+ try{
+ if(fileData!=null){
+ String[] fileLines = new String[]{};
+ fileLines = fileData.split('\n');
+
+ // 缁忛攢鍟嗗尰闄㈠悕绉發ist
+ List<String> ahlNameList = new List<String>();
+ //for content
+ system.debug('fileLines.size()==============>'+fileLines.size());
+ for (Integer i=1,j=fileLines.size();i<j;i++){
+ List<String> inputvalues = new List<String>();
+ system.debug('fileLines[i]= '+fileLines[i].replace(',','').trim()+' +++');
+ if(fileLines[i].replace(',','').trim()!=''){
+ inputvalues = fileLines[i].split(',');
+ if(inputvalues != null){
+ if(inputvalues[1] == '' || inputvalues[1] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹尰闄笉鑳戒负绌�';
+ }
+ ahlNameList.add(inputvalues[1]);
+ }
+ }
+ }
+ system.debug('ahlNameList==============>'+ahlNameList);
+ // 缁忛攢鍟嗗尰闄㈢殑ocsm鍖婚櫌id鐨刲ist
+ List<String> ahlOcsmIdList = new List<String>();
+ List<Agency_Hospital_Link__c> ahlList = [select id,name,Hospital__c,MaxActivityDate__c from Agency_Hospital_Link__c where name = :ahlNameList and Agency_Campaign_Obj__c = true];
+
+ for(Agency_Hospital_Link__c ahl : ahlList){
+ ahlOcsmIdList.add(ahl.Hospital__c);
+ }
+ //List<Agency_Contact__c> doctor2list = [select id,Name,Doctor_Division1__c,Type__c,Agency_Hospital__c,AWS_Data_Id__c,Name_Encrypted__c FROM Agency_Contact__c WHERE Hospital_ID18__c= :ahlOcsmIdList order by Name];
+ List<Agency_Contact__c> doctor2list = [select id,Name,Doctor_Division1__c,Type__c,Agency_Hospital__c,AWS_Data_Id__c FROM Agency_Contact__c WHERE Hospital_ID18__c= :ahlOcsmIdList order by Name]; //zhj 鍘绘帀Name_Encrypted__c 鏂版柟妗堟敼閫� 2023-12-21
+ if(errorMag != ''){
+ return errorMag;
+ }
+ String doctor2listStr = JSON.serialize(doctor2list);
+ return doctor2listStr;
+ }
+ }catch(Exception e){
+ System.debug('exception'+e);
+ return e.getLineNumber()+'exception:'+e;
+ }
+ return 'success';
+ }
+ //fy 璋冪敤pi鏀归�犵殑 鑾峰彇url 鍜� token鐨勬柟娉�
+ @AuraEnabled
+ public static Map<String,String> getAwsurl(String sobj){
+ system.debug('杩涘叆getAwsurl');
+ PIHelper.PIIntegration piIntegration = PIHelper.getPIIntegrationInfo(sobj);
+ Map<String,String> awsmap = new Map<String,String>();
+ awsmap.put('token', piIntegration.token);
+ awsmap.put('newUrl', piIntegration.newUrl);
+ awsmap.put('searchUrl', piIntegration.searchUrl);
+ awsmap.put('transactionURL', piIntegration.transactionURL);
+ return awsmap;
+ }
+ // fy 瀵煎叆 20220506 end
@AuraEnabled
public static String processData(String fileData,String sobjectName,List<String> fields) {
String errorMag = '';
System.debug('fileData=================>'+fileData);
- // 鍒涘缓鍛ㄦ姤
+ // 鍒涘缓鏃ユ姤
try{
if(fileData!=null){
+ User UserProTypec = LightningUtil.loginUserId();
+ String SignInId = UserInfo.getUserId();
+
String[] fileLines = new String[]{};
fileLines = fileData.split('\n');
// 鎷呭綋鍚嶇О鐨刲ist
@@ -530,147 +698,176 @@
//for content
for (Integer i=1,j=fileLines.size();i<j;i++){
List<String> inputvalues = new List<String>();
- inputvalues = fileLines[i].split(',');
- system.debug('inputvalues:::::::'+inputvalues);
- if(inputvalues != null){
- if(inputvalues[1] == '' || inputvalues[1] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹媴褰撲笉鑳戒负绌�';
- errorMag += '=';
- }
- if(inputvalues[2] == '' || inputvalues[2] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹椿鍔ㄦ棩涓嶈兘涓虹┖';
- errorMag += '=';
- }
- if(inputvalues[3] == '' || inputvalues[3] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹尰闄笉鑳戒负绌�';
- errorMag += '=';
- }
- if(inputvalues[4] == '' || inputvalues[4] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹瀹や笉鑳戒负绌�';
- errorMag += '=';
- }
+ if(fileLines[i].replace(',','').trim()!=''){
+ inputvalues = fileLines[i].split(',');
+ system.debug('inputvalues:::::::'+inputvalues);
+ if(inputvalues != null){
+ // if(inputvalues[0] == '' || inputvalues[0] == null){
+ // errorMag += 'error1 绗�'+i+'琛屾暟鎹懆涓嶈兘涓虹┖';
+ // errorMag += '=';
+ // }
+ // if(inputvalues[0] == '' || inputvalues[0] == null){
+ // errorMag += 'error1 绗�'+i+'琛屾暟鎹媴褰撲笉鑳戒负绌�';
+ // errorMag += '=';
+ // }
+ if(inputvalues[0] == '' || inputvalues[0] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹椿鍔ㄦ棩涓嶈兘涓虹┖';
+ errorMag += '=';
+ }
+ if(inputvalues[1] == '' || inputvalues[1] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹尰闄笉鑳戒负绌�';
+ errorMag += '=';
+ }
+ if(inputvalues[2] == '' || inputvalues[2] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹瀹や笉鑳戒负绌�';
+ errorMag += '=';
+ }
+ //fy 20220414
+ // String departmentstr = GetDepartment_Cateogy(inputvalues[2]);
+ // if(departmentstr == 'no' && inputvalues[2] != '' && inputvalues[2] != null){
+ // if(inputvalues[2] != '' && inputvalues[2] != null){
+ // errorMag += 'error3 绗�'+i+'琛屾暟鎹瀹ら�夐」鍒楄〃鐨勫��'+inputvalues[2]+'涓嶅瓨鍦�';
+ // errorMag += '=';
+ // }
+ if(inputvalues[3] == '' || inputvalues[3] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹粡閿�鍟嗕汉鍛樹笉鑳戒负绌�';
+ errorMag += '=';
+ }
+ if(inputvalues[4] == '' || inputvalues[4] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹椿鍔ㄥ尯鍒嗕笉鑳戒负绌�';
+ errorMag += '=';
+ }
+ boolean purposeType = GetPurposeType(inputvalues[4]);
+ if(!purposeType && inputvalues[4] != '' && inputvalues[4] != null){
+ errorMag += 'error3 绗�'+i+'琛屾暟鎹椿鍔ㄥ尯鍒嗛�夐」鍒楄〃鐨勫��'+inputvalues[4]+'涓嶅瓨鍦�';
+ errorMag += '=';
+ }
+ if(inputvalues[4] == 'SIS'||inputvalues[4] == '绉戝浼�'||inputvalues[4] == '闄㈠唴鍏ラ櫌鐢宠'||inputvalues[4] == '鏀惰垂椤圭洰鐢宠'){
+ if(inputvalues[5] == '' || inputvalues[5] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹嫓璁夸汉涓嶈兘涓虹┖';
+ errorMag += '=';
+ }
+ }
+ if(inputvalues[6] == '' || inputvalues[6] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹骇鍝佸垎绫�(绗笁鍒嗙被)涓嶈兘涓虹┖';
+ errorMag += '=';
+ }
+ // if(inputvalues[4] != '涓村簥淇℃伅(浣跨敤閲�)鏀堕泦' && inputvalues[4] != 'QIS澶勭悊'){
+ if(inputvalues[4] != '涓村簥淇℃伅(浣跨敤閲�)鏀堕泦' ){
+ if(inputvalues[7] == '' || inputvalues[7] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹娇鐢ㄤ骇鍝�1涓嶈兘涓虹┖';
+ errorMag += '=';
+ }
+ }
+ if((inputvalues[8] != '' && inputvalues[8] != null)&& inputvalues[7] == inputvalues[8]){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹娇鐢ㄤ骇鍝�1鍜屼娇鐢ㄤ骇鍝�2鐨勫�间笉鑳介噸澶�';
+ errorMag += '=';
+ }
+ if((inputvalues[9] != '' && inputvalues[9] != null)&& inputvalues[7] == inputvalues[9]){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹娇鐢ㄤ骇鍝�1鍜屼娇鐢ㄤ骇鍝�3鐨勫�间笉鑳介噸澶�';
+ errorMag += '=';
+ }
+ if((inputvalues[8] != '' && inputvalues[8] != null) && (inputvalues[9] != '' && inputvalues[9] != null) && inputvalues[8] == inputvalues[9]){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹娇鐢ㄤ骇鍝�2鍜屼娇鐢ㄤ骇鍝�3鐨勫�间笉鑳介噸澶�';
+ errorMag += '=';
+ }
+ if(inputvalues[4] != '涓村簥淇℃伅(浣跨敤閲�)鏀堕泦' && inputvalues[4] != '甯傚満鎺ㄥ箍绫绘椿鍔�'){
+ if(inputvalues[10] == '' || inputvalues[10] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹晥鏋�/杩涘害涓嶈兘涓虹┖';
+ errorMag += '=';
+ }
+ }
+ if(inputvalues[4] == '涓村簥淇℃伅(浣跨敤閲�)鏀堕泦'){
+ if(inputvalues[11] == '' || inputvalues[11] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹骇鍝�1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺涓嶈兘涓虹┖';
+ errorMag += '=';
+ }
+ }
+ if(inputvalues[11] != '' && inputvalues[11] != null){
+ boolean wanked = wncc(inputvalues[11]);
+ // if(!wanked && inputvalues[11] == '' || inputvalues[11] == null){
+ if(!wanked){
+ errorMag += 'error3 绗�'+i+'琛屾暟鎹敊璇�,璇锋鏌ヤ綘鐨勪骇鍝�1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺!';
+ errorMag += '=';
+ }
+ }
+ //鏆傛椂娉ㄦ帀鍥犱负ENG鐨勬湳澹垎绫讳负绌烘墍浠ユ殏鏃舵敞鎺�
+ if(inputvalues[4] == '涓村簥淇℃伅(浣跨敤閲�)鏀堕泦'){
+ if(inputvalues[12] == '' || inputvalues[12] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹骇鍝�1瀵瑰簲鏈紡鍒嗙被涓嶈兘涓虹┖';
+ errorMag += '=';
+ }
+ }
+ if(inputvalues[4] == '涓村簥淇℃伅(浣跨敤閲�)鏀堕泦'){
+ if(inputvalues[13] == '' || inputvalues[13] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹凡閲囩敤鍏朵粬浜у搧涓嶈兘涓虹┖';
+ errorMag += '=';
+ }
+ }
+ //鏆傛椂娉ㄦ帀鍥犱负ET鐨勫叾浠栧搧鐗屼骇鍝佺被鍒病鏈夋暟鎹�
+ if(inputvalues[4] == '涓村簥淇℃伅(浣跨敤閲�)鏀堕泦' && UserProTypec.UserPro_Type__c =='ENG'){
+ if(inputvalues[14] == '' || inputvalues[14] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹湳澹娇鐢ㄤ骇鍝佸搴旀暟閲忎笉鑳戒负绌�';
+ errorMag += '=';
+ }
+ }
+ if(inputvalues[4] == '涓村簥淇℃伅(浣跨敤閲�)鏀堕泦'){
+ if(inputvalues[15] == '' || inputvalues[15] == null){
+ errorMag += 'error1 绗�'+i+'琛屾暟鎹骇鍝佺敤閲忎笉鑳戒负绌�';
+ errorMag += '=';
+ }
+ }
+ if(inputvalues[15] != '' && inputvalues[15] != null){
+ boolean wankeds = wncc(inputvalues[15]);
+ if(!wankeds){
+ errorMag += 'error3 绗�'+i+'琛屾暟鎹敊璇�,璇锋鏌ヤ綘鐨勪骇鍝佺敤閲�!';
+ errorMag += '=';
+ }
+ }
+ system.debug('inputvalues[0]====='+inputvalues[0]);
+ system.debug('inputvalues[1]====='+inputvalues[1]);
+ system.debug('inputvalues[2]====='+inputvalues[2]);
+ system.debug('inputvalues[3]====='+inputvalues[3]);
+ system.debug('inputvalues[4]====='+inputvalues[4]);
+ system.debug('inputvalues[5]====='+inputvalues[5]);
+ system.debug('inputvalues[6]====='+inputvalues[6]);
+ system.debug('inputvalues[7]====='+inputvalues[7]);
+ system.debug('inputvalues[8]====='+inputvalues[8]);
+ system.debug('inputvalues[9]====='+inputvalues[9]);
+ system.debug('inputvalues[10]====='+inputvalues[10]);
+ system.debug('inputvalues[11]====='+inputvalues[11]);
+ system.debug('inputvalues[12]====='+inputvalues[12]);
+ system.debug('inputvalues[13]====='+inputvalues[13]);
+ system.debug('inputvalues[14]====='+inputvalues[14]);
+ system.debug('inputvalues[15]====='+inputvalues[15]);
+ system.debug('inputvalues[16]====='+inputvalues[16]);
+ // system.debug('inputvalues[17]====='+inputvalues[17]);
+ //鎷呭綋
+ // nameList.add(inputvalues[1]);
+ //鎶ュ憡鏃�
+ dateList.add(Date.valueOf(inputvalues[0].replace('/','-')));
- String departmentstr = GetDepartment_Cateogy(inputvalues[4]);
- if(departmentstr == 'no' && inputvalues[4] != '' && inputvalues[4] != null){
- errorMag += 'error3 绗�'+i+'琛屾暟鎹瀹ら�夐」鍒楄〃鐨勫��'+inputvalues[4]+'涓嶅瓨鍦�';
- errorMag += '=';
+ //缁忛攢鍟嗗尰闄�
+ ahlNameList.add(inputvalues[1]);
+ //浣跨敤浜у搧1
+ Product2NameList.add(inputvalues[7]);
+ //浣跨敤浜у搧2
+ Product2NameList.add(inputvalues[8]);
+ //浣跨敤浜у搧3
+ Product2NameList.add(inputvalues[9]);
+ //鏁堟灉杩涘害
+ EffectProgressList.add(inputvalues[10]);
+ //鏈＋鍒嗙被
+ OtherBrandConsumablesList.add(inputvalues[12]);
+ //宸查噰鐢ㄥ叾浠栧搧鐗�
+ ProductCcategoryList.add(inputvalues[13]);
+ //鍏朵粬鍝佺墝浜у搧绫诲埆
+ productCategoriesList.add(inputvalues[14]);
+ //绉戝
+ // departmentSet.add('%'+GetDepartment_Cateogy(inputvalues[2])+'%'+'-'+GetEPurposeType(inputvalues[8]));
+ //瀵煎叆鐨勬暟鎹�
+ inputList.add(inputvalues);
}
- if(inputvalues[5] == '' || inputvalues[5] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹粡閿�鍟嗕汉鍛樹笉鑳戒负绌�';
- errorMag += '=';
- }
- if(inputvalues[6] == '' || inputvalues[6] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹伐浣滆褰曚笉鑳戒负绌�';
- errorMag += '=';
- }
- boolean purposeType = GetPurposeType(inputvalues[6]);
- if(!purposeType && inputvalues[6] != '' && inputvalues[6] != null){
- errorMag += 'error3 绗�'+i+'琛屾暟鎹伐浣滆褰曢�夐」鍒楄〃鐨勫��'+inputvalues[6]+'涓嶅瓨鍦�';
- errorMag += '=';
- }
- if(inputvalues[7] == '' || inputvalues[7] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹尰闄汉鍛樹笉鑳戒负绌�';
- errorMag += '=';
- }
- if(inputvalues[8] == '' || inputvalues[8] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹骇鍝佸垎绫�(绗笁鍒嗙被)涓嶈兘涓虹┖';
- errorMag += '=';
- }
- if(inputvalues[9] == '' || inputvalues[9] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹娇鐢ㄤ骇鍝�1涓嶈兘涓虹┖';
- errorMag += '=';
- }
- if((inputvalues[10] != '' && inputvalues[10] != null)&& inputvalues[9] == inputvalues[10]){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹娇鐢ㄤ骇鍝�1鍜屼娇鐢ㄤ骇鍝�2鐨勫�间笉鑳介噸澶�';
- errorMag += '=';
- }
- if((inputvalues[11] != '' && inputvalues[11] != null)&& inputvalues[9] == inputvalues[11]){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹娇鐢ㄤ骇鍝�1鍜屼娇鐢ㄤ骇鍝�3鐨勫�间笉鑳介噸澶�';
- errorMag += '=';
- }
- if((inputvalues[10] != '' && inputvalues[10] != null) && (inputvalues[11] != '' && inputvalues[11] != null) && inputvalues[10] == inputvalues[11]){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹娇鐢ㄤ骇鍝�2鍜屼娇鐢ㄤ骇鍝�3鐨勫�间笉鑳介噸澶�';
- errorMag += '=';
- }
- if(inputvalues[12] == '' || inputvalues[12] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹晥鏋�/杩涘害涓嶈兘涓虹┖';
- errorMag += '=';
- }
- if(inputvalues[13] == '' || inputvalues[13] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹瀹ゅ悓绫昏�楁潗鏈堜娇鐢ㄩ噺涓嶈兘涓虹┖';
- errorMag += '=';
- }
- boolean wanked = wncc(inputvalues[13]);
- if(!wanked && inputvalues[13] == '' || inputvalues[13] == null){
- errorMag += 'error3 绗�'+i+'琛屾暟鎹敊璇�,璇锋鏌ヤ綘鐨勭瀹ゅ悓绫昏�楁潗鏈堜娇鐢ㄩ噺!';
- errorMag += '=';
- }
- //鏆傛椂娉ㄦ帀鍥犱负ENG鐨勬湳澹垎绫讳负绌烘墍浠ユ殏鏃舵敞鎺�
- // if(inputvalues[14] == '' || inputvalues[14] == null){
- // errorMag += 'error1 绗�'+i+'琛屾暟鎹叾浠栧搧鐗岃�楁潗浣跨敤涓嶈兘涓虹┖';
- // errorMag += '=';
- // }
- if(inputvalues[15] == '' || inputvalues[15] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹凡閲囩敤鍏朵粬浜у搧涓嶈兘涓虹┖';
- errorMag += '=';
- }
- //鏆傛椂娉ㄦ帀鍥犱负ET鐨勫叾浠栧搧鐗屼骇鍝佺被鍒病鏈夋暟鎹�
- // if(inputvalues[16] == '' || inputvalues[16] == null){
- // errorMag += 'error1 绗�'+i+'琛屾暟鎹湳澹娇鐢ㄤ骇鍝佸搴旀暟閲忎笉鑳戒负绌�';
- // errorMag += '=';
- // }
- if(inputvalues[17] == '' || inputvalues[17] == null){
- errorMag += 'error1 绗�'+i+'琛屾暟鎹湳浜у搧鐢ㄩ噺涓嶈兘涓虹┖';
- errorMag += '=';
- }
- boolean wankeds = wncc(inputvalues[17]);
- if(!wankeds && inputvalues[17] == '' || inputvalues[17] == null){
- errorMag += 'error3 绗�'+i+'琛屾暟鎹敊璇�,璇锋鏌ヤ綘鐨勪骇鍝佺敤閲�!';
- errorMag += '=';
- }
- system.debug('inputvalues[1]====='+inputvalues[1]);
- system.debug('inputvalues[2]====='+inputvalues[2]);
- system.debug('inputvalues[3]====='+inputvalues[3]);
- system.debug('inputvalues[4]====='+inputvalues[4]);
- system.debug('inputvalues[5]====='+inputvalues[5]);
- system.debug('inputvalues[6]====='+inputvalues[6]);
- system.debug('inputvalues[7]====='+inputvalues[7]);
- system.debug('inputvalues[8]====='+inputvalues[8]);
- system.debug('inputvalues[9]====='+inputvalues[9]);
- system.debug('inputvalues[10]====='+inputvalues[10]);
- system.debug('inputvalues[11]====='+inputvalues[11]);
- system.debug('inputvalues[12]====='+inputvalues[12]);
- system.debug('inputvalues[13]====='+inputvalues[13]);
- system.debug('inputvalues[14]====='+inputvalues[14]);
- system.debug('inputvalues[15]====='+inputvalues[15]);
- system.debug('inputvalues[16]====='+inputvalues[16]);
- system.debug('inputvalues[17]====='+inputvalues[17]);
- system.debug('inputvalues[18]====='+inputvalues[18]);
- //鎷呭綋
- nameList.add(inputvalues[1]);
- //鎶ュ憡鏃�
- dateList.add(Date.valueOf(inputvalues[2].replace('/','-')));
-
- //缁忛攢鍟嗗尰闄�
- ahlNameList.add(inputvalues[3]);
- //浣跨敤浜у搧1
- Product2NameList.add(inputvalues[9]);
- //浣跨敤浜у搧2
- Product2NameList.add(inputvalues[10]);
- //浣跨敤浜у搧3
- Product2NameList.add(inputvalues[11]);
- //鏁堟灉杩涘害
- EffectProgressList.add(inputvalues[12]);
- //鏈＋鍒嗙被
- OtherBrandConsumablesList.add(inputvalues[14]);
- //宸查噰鐢ㄥ叾浠栧搧鐗�
- ProductCcategoryList.add(inputvalues[15]);
- //鍏朵粬鍝佺墝浜у搧绫诲埆
- productCategoriesList.add(inputvalues[16]);
- //绉戝
- // departmentSet.add('%'+GetDepartment_Cateogy(inputvalues[4])+'%'+'-'+GetEPurposeType(inputvalues[10]));
- //瀵煎叆鐨勬暟鎹�
- inputList.add(inputvalues);
}
}
// 鎷呭綋鍚嶇О鍖归厤鐨刴ap
@@ -688,6 +885,7 @@
Map<String,FieldClassification__c> EffectProgressMap = new Map<String,FieldClassification__c>();
// 鏈＋鍒嗙被
Map<String,FieldClassification__c> OtherBrandConsumablesMap = new Map<String,FieldClassification__c>();
+ Map<String,AggregateResult> OtherBrandConsumablesMap2 = new Map<String,AggregateResult>();
// 宸查噰鐢ㄥ叾浠栦骇鍝�
Map<String,FieldClassification__c> ProductCcategorynMap = new Map<String,FieldClassification__c>();
// 鍏朵粬鍝佺墝浜у搧绫诲埆
@@ -714,12 +912,38 @@
Map<String,String> DealerPersonnelMap = new Map<String,String>();
// 缁忛攢鍟嗚浠风殑map
Map<String,Agency_Opportunity__c> aoMap = new Map<String,Agency_Opportunity__c>();
+ //鏈紡鍒嗙被 鐨勮繛涓笅鎷夐�夐」
+ List<FieldClassification__c> FieldClassification2List;
+ List<AggregateResult> WarlockClassificationList2;
+
List<Contact> conList = LightningUtil.selectAgencyPerson03();
List<OlympusCalendar__c> olympusDateList = [select Id,Date__c,FirstDayOfWeek__c,DayOfTheWeek__c from OlympusCalendar__c where Date__c= :dateList ];
- List<Agency_Hospital_Link__c> ahlList = [select id,name,Hospital__c,MaxActivityDate__c from Agency_Hospital_Link__c where name = :ahlNameList and Agency_Campaign_Obj__c = true];
- List<Product2> pr2List = [select id,name from Product2 where name in:Product2NameList];
+ //鍖婚櫌
+ List<Agency_Hospital_Link__c> ahlList;
+ Contact conStrList = [select AccountId from contact where id in (select ContactId from User where id =: SignInId)];
+ String strAgencyId =conStrList.AccountId;
+ System.debug('UserProTypec.UserPro_Type__c = ' + UserProTypec.UserPro_Type__c);
+ if(UserProTypec.UserPro_Type__c == 'ENG'){
+ ahlList = [select id,name,Hospital__c,MaxActivityDate__c from Agency_Hospital_Link__c where Agency__c =: strAgencyId and name = :ahlNameList and AgencyHos_ENG__c = true and Agency_Campaign_Obj__c = true];
+ }else {
+ ahlList = [select id,name,Hospital__c,MaxActivityDate__c from Agency_Hospital_Link__c where Agency__c =: strAgencyId and name = :ahlNameList and AgencyHos_ET__c = true and Agency_Campaign_Obj__c = true];
+ }
+ // List<Agency_Hospital_Link__c> ahlList = [select id,name,Hospital__c,MaxActivityDate__c from Agency_Hospital_Link__c where name = :ahlNameList and Agency_Campaign_Obj__c = true];
+ //浣跨敤浜у搧
+ List<Product2> pr2List;
+ if(UserProTypec.UserPro_Type__c == 'ET'){
+ pr2List = [select Id, Name,Category3__c,Asset_Model_No__c from Product2 where Asset_Model_No__c in:Product2NameList AND Dealer_Object__c = true AND Estimation_Entry_Possibility__c = '鈼�'];
+ }else{
+ pr2List = [select Id, Name,Category3__c,Asset_Model_No__c from Product2 where Category4__c='Thunderbeat' AND Asset_Model_No__c in:Product2NameList AND ENG_DeaerProFlag__c = true AND Estimation_Entry_Possibility__c = '鈼�'];
+ }
+ system.debug('pr2List++'+pr2List);
+ // List<Product2> pr2List = [select id,name from Product2 where name in:Product2NameList];
List<FieldClassification__c> FieldClassification1List = [select id,EffectProgress__c from FieldClassification__c where EffectProgress__c in :EffectProgressList];
- List<FieldClassification__c> FieldClassification2List = [select id,WarlockClassification__c from FieldClassification__c where WarlockClassification__c in :OtherBrandConsumablesList];
+ if(UserProTypec.UserPro_Type__c =='ET'){
+ FieldClassification2List = [select id,WarlockClassification__c from FieldClassification__c where WarlockClassification__c in :OtherBrandConsumablesList];
+ }else{
+ WarlockClassificationList2 = [select count(id) sum, Category4__c from product2 where ENG_DeaerProFlag__c = true group by Category4__c ];
+ }
List<FieldClassification__c> FieldClassification3List = [select id,ProductCcategory__c from FieldClassification__c where ProductCcategory__c in :ProductCcategoryList];
List<FieldClassification__c> FieldClassification4List = [select id,productCategories__c from FieldClassification__c where productCategories__c in :productCategoriesList];
@@ -735,28 +959,37 @@
for(OlympusCalendar__c olym : olympusIdList){
dateIdMap.put(olym.FirstDayOfWeek__c, olym.id);
}
- for(Contact con :conList){
- nameIdMap.put(con.Name.replace(' ',''), con.Id);
- nameConMap.put(con.Id, con.Name);
- }
+ // for(Contact con :conList){
+ // nameIdMap.put(con.Name.replace(' ',''), con.Id);
+ // nameConMap.put(con.Id, con.Name);
+ // }
// return testuse;
+ System.debug('ahlList = ' + ahlList);
for(Agency_Hospital_Link__c ahl : ahlList){
ahlMap.put(ahl.Name, ahl);
ahlOcsmIdList.add(ahl.Hospital__c);
ahlIdList.add(ahl.Id);
}
for(Product2 pr2 : pr2List){
- UseProductMap.put(pr2.Name, pr2);
+ UseProductMap.put(pr2.Asset_Model_No__c, pr2);
UseProductIdList.add(pr2.Id);
}
for(FieldClassification__c ep : FieldClassification1List){
EffectProgressMap.put(ep.EffectProgress__c, ep);
EffectProgressIdList.add(ep.Id);
}
- for(FieldClassification__c oc : FieldClassification2List){
- OtherBrandConsumablesMap.put(oc.WarlockClassification__c, oc);
- OtherBrandConsumablesIdList.add(oc.Id);
+ //鏈紡鍒嗙被
+ if(UserProTypec.UserPro_Type__c =='ET'){
+ for(FieldClassification__c oc : FieldClassification2List){
+ OtherBrandConsumablesMap.put(oc.WarlockClassification__c, oc);
+ OtherBrandConsumablesIdList.add(oc.Id);
+ }
+ }else{
+ for(AggregateResult oc : WarlockClassificationList2){
+ OtherBrandConsumablesMap2.put(string.valueOf(oc.get('Category4__c')), oc);
+ }
}
+
for(FieldClassification__c pc : FieldClassification3List){
ProductCcategorynMap.put(pc.ProductCcategory__c, pc);
ProductCcategorynIdList.add(pc.Id);
@@ -765,16 +998,20 @@
productCategoriesMap.put(pct.productCategories__c, pct);
productCategoriesIdList.add(pct.Id);
}
- List<Agency_Contact__c> doctor2list = [select id,Name,Doctor_Division1__c,Type__c,Agency_Hospital__c FROM Agency_Contact__c WHERE Hospital_ID18__c= :ahlOcsmIdList order by Name];
+ // List<Agency_Contact__c> doctor2list = [select id,Name,Doctor_Division1__c,Type__c,Agency_Hospital__c FROM Agency_Contact__c WHERE Hospital_ID18__c= :ahlOcsmIdList order by Name];
+ //List<Agency_Contact__c> doctor2list = [select id,Name,Doctor_Division1__c,Type__c,Agency_Hospital__c,AWS_Data_Id__c,Name_Encrypted__c FROM Agency_Contact__c WHERE Hospital_ID18__c= :ahlOcsmIdList order by Name];
+ List<Agency_Contact__c> doctor2list = [select id,Name,Doctor_Division1__c,Type__c,Agency_Hospital__c,AWS_Data_Id__c FROM Agency_Contact__c WHERE Hospital_ID18__c= :ahlOcsmIdList order by Name]; //zhj 鍘绘帀Name_Encrypted__c 鏂版柟妗堟敼閫� 2022-12-21
for(Agency_Contact__c ac : doctor2list){
- doctor2Map.put(ac.Name.replace(' ',''), ac.Id);
+ // doctor2Map.put(ac.Name.replace(' ',''), ac.Id);
+ //doctor2Map.put(ac.Name_Encrypted__c, ac.Id); //zhj 鏂版柟妗堟敼閫� 2022-12-21
+ doctor2Map.put(ac.AWS_Data_Id__c, ac.Id);
}
//缁忛攢鍟嗕汉鍛� DealerPersonnel
List<contact> conListLighrningUtil = LightningUtil.selectAgencyPerson02();
for(contact de : conListLighrningUtil){
DealerPersonnelMap.put(de.Name.replace(' ',''), de.Id);
}
- // 鍒涘缓鍛ㄦ姤
+ // 鍒涘缓鏃ユ姤
List<Agency_Report_Header__c> agency_report_headerlist = new List<Agency_Report_Header__c>();
Map<String,Agency_Report_Header__c> agency_report_headerMap = new Map<String,Agency_Report_Header__c>();
//zxk 瀛樻斁鎷呭綋
@@ -782,17 +1019,15 @@
Date week = Date.today();
String s_agency = null;
String s_agencyname = null;
- if(dateMap.get(Date.valueOf(lineList[2].replace('/','-'))) != null){
- System.debug('dateMap====涓嶇瓑浜庣┖');
- week = dateMap.get(Date.valueOf(lineList[2].replace('/','-')));
- System.debug('===='+week);
+ if(dateMap.get(Date.valueOf(lineList[0].replace('/','-'))) != null){
+ week = dateMap.get(Date.valueOf(lineList[0].replace('/','-')));
}
- System.debug('lineList[1].replace()'+lineList[1].replace(' ',''));
- if(nameIdMap.get(lineList[1].replace(' ','')) != null){
- System.debug('nameIdMap====涓嶇瓑浜庣┖');
- s_agency = nameIdMap.get(lineList[1].replace(' ',''));
- s_agencyname = nameConMap.get(nameIdMap.get(lineList[1].replace(' ','')));
- System.debug('===='+s_agency);
+ // if(nameIdMap.get(lineList[0].replace(' ','')) != null){
+ // s_agency = nameIdMap.get(lineList[0].replace(' ',''));
+ // s_agencyname = nameConMap.get(nameIdMap.get(lineList[0].replace(' ','')));
+ if(conList != null &&conList.size()!=0){
+ s_agency = conList[0].Id;
+ s_agencyname = conList[0].Name;
}
Agency_Report_Header__c agency_report_header = new Agency_Report_Header__c();
agency_report_header.Name = s_agencyname + ' (' + week.format().replace('/','-') + ')';
@@ -816,116 +1051,182 @@
User UserPro = LightningUtil.loginUserId();
String UserProTypeStr = UserPro.UserPro_Type__c;
for(List<String> lineList :inputList){
- // 鍒涘缓鍛ㄦ姤鏄庣粏
+ // 鍒涘缓鏃ユ姤鏄庣粏
Date week = null;
String s_agency = null;
- if(dateMap.get(Date.valueOf(lineList[2].replace('/','-'))) != null){
- System.debug('dateMap====涓嶇瓑浜庣┖');
- week = dateMap.get(Date.valueOf(lineList[2].replace('/','-')));
- System.debug('===='+week);
+ if(dateMap.get(Date.valueOf(lineList[0].replace('/','-'))) != null){
+ week = dateMap.get(Date.valueOf(lineList[0].replace('/','-')));
}
- if(nameIdMap.get(lineList[1].replace(' ','')) != null){
- System.debug('nameIdMap====涓嶇瓑浜庣┖');
- s_agency = nameIdMap.get(lineList[1].replace(' ',''));
- System.debug('===='+s_agency);
+ // if(nameIdMap.get(lineList[0].replace(' ','')) != null){
+ // s_agency = nameIdMap.get(lineList[0].replace(' ',''));
+ // }
+ if(conList != null &&conList.size()!=0){
+ s_agency = conList[0].Id;
}
Agency_Report__c agencyReport = new Agency_Report__c();
- if(week == null && lineList[2] != '' && lineList[2] != null){
- errorMag += 'error2 绗�'+hang+'琛屾暟鎹姤鍛婃棩'+lineList[2]+'濉啓鏈夎';
+ if(week == null && lineList[0] != '' && lineList[0] != null){
+ errorMag += 'error2 绗�'+hang+'琛屾暟鎹姤鍛婃棩 '+lineList[0]+'濉啓鏈夎';
errorMag += '=';
}
agencyReport.Submit_date__c = week;
- if((s_agency == null || s_agency == '')&& lineList[1] != '' && lineList[1] != null){
- errorMag += 'error2 绗�'+hang+'琛屾暟鎹媴褰�'+lineList[1]+'涓嶅瓨鍦�';
- errorMag += '=';
- }
+ // if((s_agency == null || s_agency == '')&& lineList[0] != '' && lineList[0] != null){
+ // errorMag += 'error2 绗�'+hang+'琛屾暟鎹媴褰�'+lineList[0]+'涓嶅瓨鍦�';
+ // errorMag += '=';
+ // }
agencyReport.Person_In_Charge2__c = s_agency;
- if(lineList[2] != null && lineList[2] != ''){
- agencyReport.Report_Date__c = Date.valueOf(lineList[2].replace('/','-'));
+ if(lineList[0] != null && lineList[0] != ''){
+ agencyReport.Report_Date__c = Date.valueOf(lineList[0].replace('/','-'));
}
- if(ahlMap.containsKey(lineList[3])){
- agencyReport.Agency_Hospital__c = ahlMap.get(lineList[3]).Id;
- ahlMap.get(lineList[3]).MaxActivityDate__c = week;
+ System.debug('ahlMap = ' + ahlMap);
+ System.debug('lineList[1] = ' + lineList[1]);
+ if(ahlMap.containsKey(lineList[1])){
+ agencyReport.Agency_Hospital__c = ahlMap.get(lineList[1]).Id;
+ ahlMap.get(lineList[1]).MaxActivityDate__c = week;
+ }else{
+ if(lineList[1] != '' && lineList[1] != null){
+ errorMag += 'error2 绗�'+hang+'琛屾暟鎹粡閿�鍟嗗尰闄� '+lineList[1]+'涓嶅瓨鍦�';
+ errorMag += '=';
+ }
+ }
+ // String departmentE = GetDepartment_Cateogy(lineList[2]);
+ // if(departmentE != 'no'){// fy Department_Cateogy_text__c
+ // agencyReport.Department_Cateogy__c = departmentE;
+ agencyReport.Department_Cateogy_text__c =lineList[2];
+ // }else{
+ // }
+ if(DealerPersonnelMap.containsKey(lineList[3].replace(' ',''))){
+ agencyReport.DealerPersonnel__c = DealerPersonnelMap.get(lineList[3].replace(' ',''));
}else{
if(lineList[3] != '' && lineList[3] != null){
- errorMag += 'error2 绗�'+hang+'琛屾暟鎹粡閿�鍟嗗尰闄�'+lineList[3]+'涓嶅瓨鍦�';
+ errorMag += 'error2 绗�'+hang+'琛屾暟鎹粡閿�鍟嗕汉鍛� '+lineList[3]+'涓嶅瓨鍦�';
errorMag += '=';
}
}
- String departmentE = GetDepartment_Cateogy(lineList[4]);
- if(departmentE != 'no'){
- agencyReport.Department_Cateogy__c = departmentE;
- }else{
+ if(GetPurposeType(lineList[4])){
+ agencyReport.WorkRecord__c = lineList[4];
}
- if(DealerPersonnelMap.containsKey(lineList[5].replace(' ',''))){
- agencyReport.DealerPersonnel__c = DealerPersonnelMap.get(lineList[5].replace(' ',''));
+ if(agencyReport.WorkRecord__c == '绉戝浼�'){
+ if(lineList[5]=='鍖荤敓'||lineList[5]=='鍖荤敓+鎶ゅ＋'||lineList[5]=='鍖荤敓锛嬫姢澹�'){
+ agencyReport.doctor3__c = lineList[5];
+ }else{
+ if(lineList[5] != '' && lineList[5] != null){
+ errorMag += 'error2 绗�'+hang+'琛屾暟鎹嫓璁夸汉 '+lineList[5]+'涓嶅瓨鍦�';
+ errorMag += '=';
+ }
+ }
}else{
- if(lineList[5] != '' && lineList[5] != null){
- errorMag += 'error2 绗�'+hang+'琛屾暟鎹粡閿�鍟嗕汉鍛�'+lineList[5]+'涓嶅瓨鍦�';
- errorMag += '=';
+ // if(doctor2Map.containsKey(lineList[5].replace(' ',''))){
+ if(doctor2Map.containsKey(lineList[5])){
+ // if(agencyReport.WorkRecord__c == '绉戝浼�'){
+ // agencyReport.doctor3__c = doctor2Map.get(lineList[5].replace(' ',''));
+ // }else{
+ // agencyReport.doctor2__c = doctor2Map.get(lineList[5].replace(' ',''));
+ agencyReport.doctor2__c = doctor2Map.get(lineList[5]);
+ // }
+ }else{
+ if(lineList[5] != '' && lineList[5] != null){
+ errorMag += 'error2 绗�'+hang+'琛屾暟鎹鎴蜂汉鍛� '+lineList[5]+'涓嶅瓨鍦�';
+ errorMag += '=';
+ }
}
}
- if(GetPurposeType(lineList[6])){
- agencyReport.WorkRecord__c = lineList[6];
+ if(GetProductClassification(lineList[6])){
+ agencyReport.ProductClassification__c = lineList[6];
}
- if(doctor2Map.containsKey(lineList[7].replace(' ',''))){
- agencyReport.doctor2__c = doctor2Map.get(lineList[7].replace(' ',''));
+ system.debug('UseProductMap+++'+UseProductMap);
+ system.debug('agencyReport.ProductClassification__c+++'+agencyReport.ProductClassification__c);
+ if(UseProductMap.containsKey(lineList[7])){
+ if(UseProductMap.get(lineList[7]).Category3__c==agencyReport.ProductClassification__c){
+ agencyReport.UseProduct1__c = UseProductMap.get(lineList[7]).Id;
+ }else{
+ errorMag += 'error2 绗�'+hang+'琛屾暟鎹娇鐢ㄤ骇鍝�1浜у搧鍨嬪彿 '+lineList[7]+'鍜岀涓夊垎绫绘棤娉曞尮閰�';
+ errorMag += '=';
+ }
+ // agencyReport.UseProduct1__c = UseProductMap.get(lineList[7]).Id;
}else{
if(lineList[7] != '' && lineList[7] != null){
- errorMag += 'error2 绗�'+hang+'琛屾暟鎹鎴蜂汉鍛�'+lineList[7]+'涓嶅瓨鍦�';
+ errorMag += 'error2 绗�'+hang+'琛屾暟鎹娇鐢ㄤ骇鍝�1 '+lineList[7]+'涓嶅瓨鍦�';
errorMag += '=';
}
}
- if(GetProductClassification(lineList[8])){
- agencyReport.ProductClassification__c = lineList[8];
+
+ if(UseProductMap.containsKey(lineList[8])){
+ if(UseProductMap.get(lineList[8]).Category3__c==agencyReport.ProductClassification__c){
+ agencyReport.UseProduct2__c = UseProductMap.get(lineList[8]).Id;
+ }else{
+ errorMag += 'error2 绗�'+hang+'琛屾暟鎹娇鐢ㄤ骇鍝�2浜у搧鍨嬪彿 '+lineList[8]+'鍜岀涓夊垎绫绘棤娉曞尮閰�';
+ errorMag += '=';
+ }
+ // agencyReport.UseProduct2__c = UseProductMap.get(lineList[8]).Id;
+ }else{
+ if(lineList[8] != '' && lineList[8] != null){
+ errorMag += 'error2 绗�'+hang+'琛屾暟鎹娇鐢ㄤ骇鍝�2 '+lineList[8]+'涓嶅瓨鍦�';
+ errorMag += '=';
+ }
}
if(UseProductMap.containsKey(lineList[9])){
- agencyReport.UseProduct1__c = UseProductMap.get(lineList[9]).Id;
+ if(UseProductMap.get(lineList[9]).Category3__c==agencyReport.ProductClassification__c){
+ agencyReport.UseProduct3__c = UseProductMap.get(lineList[9]).Id;
+ }else{
+ errorMag += 'error2 绗�'+hang+'琛屾暟鎹娇鐢ㄤ骇鍝�3浜у搧鍨嬪彿 '+lineList[9]+'鍜岀涓夊垎绫绘棤娉曞尮閰�';
+ errorMag += '=';
+ }
+ // agencyReport.UseProduct3__c = UseProductMap.get(lineList[9]).Id;
}else{
if(lineList[9] != '' && lineList[9] != null){
- errorMag += 'error2 绗�'+hang+'琛屾暟鎹娇鐢ㄤ骇鍝�1'+lineList[9]+'涓嶅瓨鍦�';
+ errorMag += 'error2 绗�'+hang+'琛屾暟鎹娇鐢ㄤ骇鍝�3 '+lineList[9]+'涓嶅瓨鍦�';
errorMag += '=';
}
}
- if(UseProductMap.containsKey(lineList[10])){
- agencyReport.UseProduct2__c = UseProductMap.get(lineList[10]).Id;
+ if(EffectProgressMap.containsKey(lineList[10])){
+ agencyReport.EffectProgress__c = EffectProgressMap.get(lineList[10]).EffectProgress__c;
+ }
+ boolean wankeds1 = wncc(lineList[11]);
+ if(lineList[11] != null && lineList[11] != ''&&wankeds1){
+ agencyReport.ConsumptionOfConsumables__c = Decimal.valueOf(lineList[11]);
+ }
+ if(UserProTypec.UserPro_Type__c =='ET'){
+ if(OtherBrandConsumablesMap.containsKey(lineList[12])){
+ agencyReport.WarlockClassification__c = OtherBrandConsumablesMap.get(lineList[12]).WarlockClassification__c;
+ }
+ // else{
+ // if(lineList[12]!=null &&lineList[12]!=''){
+ // errorMag += 'error2 绗�'+hang+'琛屾暟鎹骇鍝�1瀵瑰簲鏈紡鍒嗙被'+lineList[12]+'涓嶅瓨鍦�';
+ // errorMag += '=';
+ // }
+ // }
}else{
- if(lineList[10] != '' && lineList[10] != null){
- errorMag += 'error2 绗�'+hang+'琛屾暟鎹娇鐢ㄤ骇鍝�2'+lineList[10]+'涓嶅瓨鍦�';
- errorMag += '=';
+ if(OtherBrandConsumablesMap2.containsKey(lineList[12])){
+ agencyReport.WarlockClassification__c = string.valueOf(OtherBrandConsumablesMap2.get(lineList[12]).get('Category4__c'));
+ }
+ // else{
+ // if(lineList[12]!=null &&lineList[12]!=''){
+ // errorMag += 'error2 绗�'+hang+'琛屾暟鎹骇鍝�1瀵瑰簲鏈紡鍒嗙被'+lineList[12]+'涓嶅瓨鍦�';
+ // errorMag += '=';
+ // }
+ // }
+ }
+ if(ProductCcategorynMap.containsKey(lineList[13])){
+ agencyReport.ProductCcategory__c = ProductCcategorynMap.get(lineList[13]).ProductCcategory__c;
+ }
+ if(UserProTypec.UserPro_Type__c == 'ENG'){
+ if(productCategoriesMap.containsKey(lineList[14])){
+ agencyReport.productCategories__c = productCategoriesMap.get(lineList[14]).productCategories__c;
}
}
- if(UseProductMap.containsKey(lineList[11])){
- agencyReport.UseProduct3__c = UseProductMap.get(lineList[11]).Id;
- }else{
- if(lineList[11] != '' && lineList[11] != null){
- errorMag += 'error2 绗�'+hang+'琛屾暟鎹娇鐢ㄤ骇鍝�3'+lineList[11]+'涓嶅瓨鍦�';
- errorMag += '=';
- }
+ boolean wankeds2 = wncc(lineList[15]);
+ if(lineList[15] != null && lineList[15] != ''&&wankeds2){
+ agencyReport.warlocksNumber__c = Decimal.valueOf(lineList[15]);
}
- if(EffectProgressMap.containsKey(lineList[12])){
- agencyReport.EffectProgress__c = EffectProgressMap.get(lineList[12]).EffectProgress__c;
- }
- 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;
- }
- if(ProductCcategorynMap.containsKey(lineList[15])){
- agencyReport.ProductCcategory__c = ProductCcategorynMap.get(lineList[15]).ProductCcategory__c;
- }
- if(productCategoriesMap.containsKey(lineList[16])){
- agencyReport.productCategories__c = productCategoriesMap.get(lineList[16]).productCategories__c;
- }
- if(lineList[17] != null){
- agencyReport.warlocksNumber__c = Decimal.valueOf(lineList[17]);
- }
- if(lineList[18] == 'true'){
+ system.debug('lineList[16]=='+lineList[16]+'+++');
+ String workmarkvalue=lineList[16].trim();
+ system.debug('workmarkvalue==++'+workmarkvalue+'+++');
+ if(workmarkvalue=='闇�瑕�'){
agencyReport.WorkMark__c = true;
}else{
agencyReport.WorkMark__c = false;
}
+ system.debug('agencyReport.WorkMark__c+++'+agencyReport.WorkMark__c);
agencyReport.WeeklyReportClassification__c = UserProTypeStr;
String headerStr = createHeader(week,s_agency);
if(agency_report_headerMap.containsKey(headerStr)){
@@ -943,7 +1244,7 @@
if(ahlMap.values().size() > 0 ){
update ahlMap.values();
}
- // 鏂板鍛ㄦ姤鏄庣粏
+ // 鏂板鏃ユ姤鏄庣粏
if(arList.size() > 0 ){
system.debug('arList==================>'+arList);
LightningUtil.insertMAgencyReport(arList);
@@ -952,7 +1253,7 @@
return 'success';
}catch(Exception e){
System.debug('exception'+e);
- return 'exception'+e;
+ return e.getLineNumber()+'exception'+e;
}
}
@@ -993,7 +1294,7 @@
return departmentE;
}
- // 鍒ゆ柇宸ヤ綔璁板綍鏄惁瀛樺湪
+ // 鍒ゆ柇娲诲姩鍖哄垎鏄惁瀛樺湪
public static boolean GetPurposeType(String purposeType){
Schema.DescribeFieldResult fieldResult = Agency_Report__c.WorkRecord__c.getDescribe();
List<Schema.PicklistEntry> ple = fieldResult.getPicklistValues();
@@ -1035,7 +1336,29 @@
}
return '';
}
- // 鎵归噺娣诲姞鍛ㄦ姤by vivek end
+ // 鎵归噺娣诲姞鏃ユ姤by vivek end
+ //SWAG-CF58C3 fy start
+ @RemoteAction
+ @AuraEnabled
+ public static Map<String, String> saveAgencyContact(String name, String type,String doctorDivision1, String agencyHospitalid, String awsid) {
+ //String name, String nameEncrypt, String type, String typeEncrypt, String doctorDivision1, String doctorDivision1Encrypt, String agencyHospitalid, String awsid //zhj 鏂版柟妗堟敼閫� 2023-12-21
+ Agency_Contact__c agency_contact = new Agency_Contact__c();
+
+ agency_contact.Name = name;
+ //agency_contact.Name_Encrypted__c = nameEncrypt; //zhj 鏂版柟妗堟敼閫� 2023-12-21
+ agency_contact.Type__c = type;
+ //agency_contact.Type_Encrypted__c = typeEncrypt; //zhj 鏂版柟妗堟敼閫� 2023-12-21
+ agency_contact.Doctor_Division1__c = doctorDivision1;
+ //agency_contact.Doctor_Division1_Encrypted__c = doctorDivision1Encrypt; //zhj 鏂版柟妗堟敼閫� 2023-12-21
+ agency_contact.Agency_Hospital__c = agencyHospitalid;
+ agency_contact.AWS_Data_Id__c = awsid;
+
+ Map<String, String> acMap = new Map<String, String>();
+
+ acMap = LightningUtil.insertAgencyContact(agency_contact);
+ return acMap;
+ }
+ //SWAG-CF58C3 fy start
@RemoteAction
@AuraEnabled
public static List<Map<String,String>> newlyBuild(String hospital_id,String nameer, String type, String doctorDivision1){
@@ -1106,22 +1429,38 @@
@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 ];
+ WarlockClassificationList2 = [select count(id) sum, Category4__c from product2 where 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 +1493,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{
@@ -1174,4 +1514,694 @@
System.debug('options=============>'+options);
return options;
}
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ @AuraEnabled
+ public static ControllerResponse searchAgencyDataId(String hospitalId){
+ ControllerResponse r = new ControllerResponse();
+ try{
+ if(String.isBlank(hospitalId)){
+ r.IsSuccess = true;
+ r.Message = 'noHospitalId';
+ return r;
+ }
+ List<Agency_Contact__c> acList = [select id,AWS_Data_Id__c,Agency_Hospital__r.Name from Agency_Contact__c where Agency_Hospital__c=:hospitalId];
+ r.IsSuccess = true;
+ r.Message = '';
+ r.Data = acList;
+ return r;
+ }catch(Exception e) {
+ System.debug('into catch'+e.getMessage());
+ r.IsSuccess = false;
+ r.message = e.getMessage()+e.getStackTraceString();
+ return r;
+ }
+ }
+ public static void improveTestRate(){
+ Integer i = 0;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ }
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
}
\ No newline at end of file
--
Gitblit v1.9.1