From bfca7a84bec815da594f1d12558535ed06d2490b Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 13 九月 2022 09:57:32 +0800
Subject: [PATCH] 本地提交备份
---
force-app/main/default/classes/NFM705Rest.cls | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/NFM705Rest.cls b/force-app/main/default/classes/NFM705Rest.cls
index 3b39cf6..985f5fa 100644
--- a/force-app/main/default/classes/NFM705Rest.cls
+++ b/force-app/main/default/classes/NFM705Rest.cls
@@ -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,10 @@
}
List<Campaign> campaignList = NumList.size() > 0 ? [select Id,
Num__c,
- MeetingApprovedNo__c
+ MeetingApprovedNo__c,
+ State_Master__c,
+ City_Master__c,
+ WorkshopPlace__c
from Campaign
where Num__c IN: NumList
] : new List<Campaign>();
@@ -269,11 +272,11 @@
if (app.MeetingType__c != '璧炲姪浼�') {
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.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 +289,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 +434,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;
--
Gitblit v1.9.1