OlyMEBG.git - Gitblit

			@@ -163,7 +163,7 @@
			aca.Num__c = ged.Num;
			aca.StartDate__c = NFMUtil.parseDateTimeStr2Date(ged.StartDate);
			aca.EndDate__c = NFMUtil.parseDateTimeStr2Date(ged.EndDate);
			aca.BudgetType__c = ged.BudgetType;
			aca.Implementation_Purpose1__c = ged.BudgetType;
			aca.OfficeCategory__c = GetOfficeCategory(ged.OfficeCategory, transferMap, iflog);
			//aca.MeetingType__c = ged.MeetingType;
			aca.MeetingType__c = DividingTypes(ged.IsCoOrganizingActivities,ged.ActivityTypeName);
			@@ -210,7 +210,12 @@
			}
			List<Campaign> campaignList = NumList.size() > 0 ? [select Id,
			Num__c,
			MeetingApprovedNo__c
			MeetingApprovedNo__c,
			State_Master__c,
			City_Master__c,
			WorkshopPlace__c,
			RecordTypeId,
			Meeting_Type__c
			from Campaign
			where Num__c IN: NumList
			] : new List<Campaign>();
			@@ -259,6 +264,7 @@
			// }
			// 更新已存在的决裁信息
			System.debug('查找到的会议: ' + campaignList.size());
			System.debug('lt123查找到的会议:--- ' + campaignList);
			if (campaignList != null && campaignList.size() > 0) {
			List<Campaign> updatelist = new List<Campaign>();
			for (Campaign cam : campaignList) {
			@@ -267,13 +273,28 @@
			cam.MeetingApprovedNo__c = app.MeetingApprovedNo__c;
			cam.Meeting_Approved_No__c = app.Id;
			if (app.MeetingType__c != '赞助会') {
			cam.StartDate = app.StartDate__c;
			cam.EndDate = app.EndDate__c;
			cam.Implementation_Purpose__c = app.BudgetType__c;
			//20221206 lt DB202212060256 start
			Id RtId = Schema.SObjectType.Campaign.getRecordTypeInfosByDeveloperName().get('Society').getRecordTypeId();
			Id RtId2 = Schema.SObjectType.Campaign.getRecordTypeInfosByDeveloperName().get('BusinessTraining').getRecordTypeId();

			if(cam.RecordTypeId == RtId \|\| cam.RecordTypeId == RtId2){
			if (cam.Meeting_Type__c != '主办会'){
			cam.StartDate = app.StartDate__c;
			cam.EndDate = app.EndDate__c;
			}
			}
			if(cam.RecordTypeId != RtId && cam.RecordTypeId != RtId2){
			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;
			@@ -286,8 +307,8 @@
			// 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);
			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;
			}


			@@ -431,7 +452,7 @@
			// cam.Meeting_Approved_No__c = app.Id;
			// cam.StartDate = app.StartDate__c;
			// cam.EndDate = app.EndDate__c;
			// cam.Implementation_Purpose__c = app.BudgetType__c;
			// cam.Implementation_Purpose__c = app.Implementation_Purpose1__c;
			// cam.OfficeCategory__c = app.OfficeCategory__c;
			// cam.Meeting_Type__c = app.MeetingType__c;
			// cam.Activity_Type_Name__c = app.ActivityTypeName__c;