OlyMEBG.git - Gitblit

			@@ -43,8 +43,12 @@

			public static List<contact> selectAgencyPerson() {
			String login_user_id = UserInfo.getUserId();
			return [select id, Name, Agency_User__c from contact where Agency_User__c = true and Isactive__c = '有效' and AccountId in
			// PIPL update Yin Mingjie 21/02/2022 start
			// return [select id, Name, Agency_User__c from contact where Agency_User__c = true and Isactive__c = '有效' and AccountId in
			// (select AccountId from User where id=:login_user_id)];
			return [select id, Name, Agency_User__c, AWS_Data_Id__c from contact where Agency_User__c = true and Isactive__c = '有效' and AccountId in
			(select AccountId from User where id=:login_user_id)];
			// PIPL update Yin Mingjie 21/02/2022 end
			}
			public static List<contact> selectAgencyPerson01() {
			String login_user_id = UserInfo.getUserId();
			@@ -147,7 +151,7 @@
			List<Contact> person_list = selectAgencyPerson();
			return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c, WorkMark__c,warlocksNumber__c,Department_Cateogy__c,ProductClassification__c,WarlockClassification__c,ProductCcategory__c, productCategories__c,DealerPersonnel__c,WorkRecord__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
			Person_In_Charge2__c,DealerPersonnel__r.Name, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
			doctor2__r.AWS_Data_Id__c,// 20220222 PI改造 by Bright
			doctor2__r.AWS_Data_Id__c,Person_In_Charge2__r.AWS_Data_Id__c,// 20220222 PI改造 by Bright
			Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name,EffectProgress__c,
			UseProduct1__c,UseProduct2__c,UseProduct3__c,UseProduct1__r.Name,UseProduct2__r.Name,UseProduct3__r.Name
			From Agency_Report__c
			@@ -155,7 +159,7 @@
			} else {
			return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c, WorkMark__c,warlocksNumber__c,Department_Cateogy__c,DealerPersonnel__c,ProductClassification__c,WarlockClassification__c,ProductCcategory__c,productCategories__c,WorkRecord__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
			Person_In_Charge2__c,DealerPersonnel__r.Name, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
			doctor2__r.AWS_Data_Id__c,// 20220222 PI改造 by Bright
			doctor2__r.AWS_Data_Id__c,Person_In_Charge2__r.AWS_Data_Id__c,// 20220222 PI改造 by Bright
			Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name,EffectProgress__c,
			UseProduct1__c,UseProduct2__c,UseProduct3__c,UseProduct1__r.Name,UseProduct2__r.Name,UseProduct3__r.Name
			From Agency_Report__c
			@@ -163,7 +167,7 @@
			}
			}
			//追溯系统
			public static List<Agency_Report__c> selectAgencyReport01(Date week, String person_str) {
			public static List<Agency_Report__c> selectAgencyReport01(Date week, String person_str) {
			system.debug('person_strperson_str=================>'+person_str);
			if (String.isBlank(person_str)) {
			List<Contact> person_list = selectAgencyPerson01();