~huangqianlong/OlyMEBG.git

			@@ -204,18 +204,20 @@
			// 会议决裁不为空时
			if (String.isNotBlank(cam.Meeting_Approved_No__c) && cam.Meeting_Approved_No__c != old_cam.Meeting_Approved_No__c) {
			app_ids.add(cam.Meeting_Approved_No__c);
			cam_ids.add(cam.Id);
			if (String.isNotBlank(cam.Id)) {
			cam_ids.add(cam.Id);
			}
			}
			}
			if (app_ids.size() > 0) {
			List<OPDPlan__c> plans = [select Id, Campaign__c, IF_Approved__c, Approved_Status__c, Approved_No__c from OPDPlan__c where Campaign__c in :cam_ids];
			List<OPDPlan__c> plans = cam_ids.size() > 0 ? [select Id, Campaign__c, IF_Approved__c, Approved_Status__c, Approved_No__c from OPDPlan__c where Campaign__c in :cam_ids] : null;
			List<Application_for_Conference_Adjudication__c> apps = [select Id,
			MeetingApprovedNo__c,
			Num__c,
			ProcessState__c,
			StartDate__c,
			EndDate__c,
			BudgetType__c,
			Implementation_Purpose1__c,
			OfficeCategory__c,
			MeetingType__c,
			ActivityTypeName__c,
			@@ -228,7 +230,8 @@
			CityMaster__c,
			IsPaidToSponsor__c,
			SponsorshipCategory__c,
			ConveningParticipantsNum__c
			ConveningParticipantsNum__c,
			Type_of_adjudication_meeting__c
			from
			Application_for_Conference_Adjudication__c
			where
			@@ -241,13 +244,30 @@
			cam.MeetingApprovedNo__c = app.MeetingApprovedNo__c;
			// 非赞助会的情况下更新以下内容
			if (app.MeetingType__c != '赞助会') {
			cam.StartDate = app.StartDate__c;
			cam.EndDate = app.EndDate__c;
			cam.Budget_Type__c = app.BudgetType__c;
			//20221206 lt DB202212060256 start
			// System.debug('lt123-------Cam------记录类型----'+cam.RecordTypeId);
			// System.debug('lt123-------Cam------会议类型----'+cam.Meeting_Type__c);
			if(cam.RecordTypeId == '01210000000QfeD' \|\| cam.RecordTypeId == '01210000000gQzO'){
			// System.debug('lt123-------Cam------1----');
			if (cam.Meeting_Type__c != '主办会'){
			// System.debug('lt123-------Cam------2----');
			cam.StartDate = app.StartDate__c;
			cam.EndDate = app.EndDate__c;
			}
			}
			if(cam.RecordTypeId != '01210000000QfeD' && cam.RecordTypeId != '01210000000gQzO'){
			// System.debug('lt123-------Cam------3----');
			cam.StartDate = app.StartDate__c;
			cam.EndDate = app.EndDate__c;
			}
			// cam.StartDate = app.StartDate__c;
			// cam.EndDate = app.EndDate__c;
			//20221206 lt DB202212060256 end
			cam.Implementation_Purpose__c = app.Implementation_Purpose1__c;
			cam.OfficeCategory__c = app.OfficeCategory__c;
			cam.Meeting_Type__c = app.MeetingType__c;

			cam.WorkshopPlace__c = app.WorkshopPlace__c;
			cam.WorkshopPlace__c = String.isNotBlank(app.WorkshopPlace__c) ? app.WorkshopPlace__c : cam.WorkshopPlace__c;
			cam.HostName__c = app.HostName__c;
			cam.cooperatorCompany__c = app.CooperatorCompany__c;
			cam.Convening_Participants_Num__c = app.ConveningParticipantsNum__c;
			@@ -257,14 +277,16 @@
			cam.Expected_Hcp_Attendance__c = app.ExpectedHcpAttendance__c;
			cam.SponsorshipCategory__c = app.SponsorshipCategory__c;
			cam.IsPaidToSponsor__c = app.IsPaidToSponsor__c;
			cam.Activity_Type_Name__c = app.ActivityTypeName__c;
			// cam.Activity_Type_Name__c = app.ActivityTypeName__c;
			cam.Activity_Type_Name__c = app.Type_of_adjudication_meeting__c;
			// 这里需要额外加操作
			cam.State_Master__c = StateCityUtil.get_state(app.StateMaster__c);
			cam.City_Master__c = StateCityUtil.get_city(app.CityMaster__c);
			}
			if (String.isBlank(app.Num__c)) {
			app.Num__c = cam.Num__c;
			set_cam_num_apps.add(app);
			cam.State_Master__c = String.isNotBlank(app.StateMaster__c) ? StateCityUtil.get_state(app.StateMaster__c) : cam.State_Master__c;
			cam.City_Master__c = String.isNotBlank(app.CityMaster__c) ? StateCityUtil.get_city(app.CityMaster__c) : cam.City_Master__c;

			if (cam.Num__c != app.Num__c) {
			app.Num__c = cam.Num__c;
			set_cam_num_apps.add(app);
			}
			}
			// opd计划上的内容更新
			if (plans != null && plans.size() > 0) {
			@@ -284,7 +306,7 @@
			if (set_cam_num_apps.size() > 0) {
			update set_cam_num_apps;
			}
			if (plans.size() > 0) {
			if (plans != null && plans.size() > 0) {
			update plans;
			}
			}