李彤
2022-05-12 a2f7f78e8b02e3613c9ff9cf584de2ec0bda075d
替换字段
7个文件已修改
32 ■■■■ 已修改文件
force-app/main/default/classes/ApplicationForCAHandler.cls 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/ApplicationForCAHandlerTest.cls 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/CampaignTriggerBefInsHandler.cls 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/NFM703Controller.cls 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/NFM703ControllerTest.cls 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/NFM703WebServiceTest.cls 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/NFM705Rest.cls 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/ApplicationForCAHandler.cls
@@ -154,7 +154,7 @@
    private Campaign update_info_from_app(Campaign cam, Application_for_Conference_Adjudication__c app) {
        cam.StartDate                        = app.StartDate__c;
        cam.EndDate                          = app.EndDate__c;
        cam.Budget_Type__c                   = app.BudgetType__c;
        cam.Implementation_Purpose__c                   = app.BudgetType__c;
        cam.OfficeCategory__c                = app.OfficeCategory__c;
        cam.Meeting_Type__c                  = app.MeetingType__c;
force-app/main/default/classes/ApplicationForCAHandlerTest.cls
@@ -55,7 +55,7 @@
        cam.Meeting_Approved_No__c           = aca.Id;
        cam.StartDate                        = aca.StartDate__c;
        cam.EndDate                          = aca.EndDate__c;
        cam.Budget_Type__c                   = aca.BudgetType__c;
        cam.Implementation_Purpose__c                   = aca.BudgetType__c;
        cam.OfficeCategory__c                = aca.OfficeCategory__c;
        cam.Meeting_Type__c                  = aca.MeetingType__c;
        cam.Activity_Type_Name__c            = aca.ActivityTypeName__c;
@@ -148,7 +148,7 @@
        cam.Meeting_Approved_No__c           = aca.Id;
        cam.StartDate                        = aca.StartDate__c;
        cam.EndDate                          = aca.EndDate__c;
        cam.Budget_Type__c                   = aca.BudgetType__c;
        cam.Implementation_Purpose__c                   = aca.BudgetType__c;
        cam.OfficeCategory__c                = aca.OfficeCategory__c;
        cam.Meeting_Type__c                  = aca.MeetingType__c;
        cam.Activity_Type_Name__c            = aca.ActivityTypeName__c;
@@ -239,7 +239,7 @@
        cam.Meeting_Approved_No__c           = aca.Id;
        cam.StartDate                        = aca.StartDate__c;
        cam.EndDate                          = aca.EndDate__c;
        cam.Budget_Type__c                   = aca.BudgetType__c;
        cam.Implementation_Purpose__c                   = aca.BudgetType__c;
        cam.OfficeCategory__c                = aca.OfficeCategory__c;
        cam.Meeting_Type__c                  = aca.MeetingType__c;
        cam.Activity_Type_Name__c            = aca.ActivityTypeName__c;
@@ -272,7 +272,7 @@
        cam_n.Meeting_Approved_No__c           = aca.Id;
        cam_n.StartDate                        = aca.StartDate__c;
        cam_n.EndDate                          = aca.EndDate__c;
        cam_n.Budget_Type__c                   = aca.BudgetType__c;
        cam_n.Implementation_Purpose__c                   = aca.BudgetType__c;
        cam_n.OfficeCategory__c                = aca.OfficeCategory__c;
        cam_n.Meeting_Type__c                  = aca.MeetingType__c;
        cam_n.Activity_Type_Name__c            = aca.ActivityTypeName__c;
@@ -302,4 +302,4 @@
        update aca;
    }
}
}
force-app/main/default/classes/CampaignTriggerBefInsHandler.cls
@@ -246,7 +246,7 @@
                            if (app.MeetingType__c != '赞助会') {
                                cam.StartDate                        = app.StartDate__c;
                                cam.EndDate                          = app.EndDate__c;
                                cam.Budget_Type__c                   = app.BudgetType__c;
                                cam.Implementation_Purpose__c                   = app.BudgetType__c;
                                cam.OfficeCategory__c                = app.OfficeCategory__c;
                                cam.Meeting_Type__c                  = app.MeetingType__c;
force-app/main/default/classes/NFM703Controller.cls
@@ -37,7 +37,7 @@
        public String ActivityTypeName; //活动形式
        public String ExpectedOlympusAttendance; //预计参会Olympus人数
        public String ExpectedHcpAttendance; //预计参会HCP人数
        public String BudgetType; //预算类型=Budget_Type__c
        public String BudgetType; //预算类型=Implementation_Purpose__c
        public String OfficeCategory; //科室分类=OfficeCategory__c
        public String MeetingType; //会议类型=Meeting_Type__c
        public String StateMaster; //省=State_Master__c
@@ -71,7 +71,7 @@
                                        Name,Num__c,
                                        StartDate,
                                        EndDate,
                                        Budget_Type__c,
                                        Implementation_Purpose__c,
                                        OfficeCategory__c,
                                        Meeting_Type__c,
                                        State_Master__r.Name,
@@ -121,7 +121,7 @@
                ged.Name               = cam.Name;
                ged.StartDate           = NFMUtil.formatDate2StrSpo(cam.StartDate);
                ged.EndDate           = NFMUtil.formatDate2StrSpo(cam.EndDate);
                ged.BudgetType        = cam.Budget_Type__c;
                ged.BudgetType        = cam.Implementation_Purpose__c;
                ged.OfficeCategory       = NFMUtil.getMapValue(transferMap, 'OfficeCategory__c', cam.OfficeCategory__c, iflog);
                ged.MeetingType       = cam.Meeting_Type__c;
                ged.ActivityTypeName  = cam.Activity_Type_Name__c;
force-app/main/default/classes/NFM703ControllerTest.cls
@@ -127,7 +127,7 @@
        cam.Name = 'cam';
        cam.Name2__c = '1234';
        cam.Meeting_Type__c = '赞助会';
        cam.Budget_Type__c = '产品推广';
        cam.Implementation_Purpose__c = '产品推广';
        cam.WorkshopPlace__c = '测试地址';
        cam.Workshop_category__c = '普通学会/会议';
        cam.Society_Type__c = '全国';
@@ -311,7 +311,7 @@
        cam.Num__c = 'MT-GI-202112-5772';
// StartDate
// EndDate
        cam.Budget_Type__c = '新产品上市';
        cam.Implementation_Purpose__c = '新产品上市';
        cam.OfficeCategory__c = null;
        cam.Meeting_Type__c = '主办会';
        cam.Activity_Type_Name__c = null;
force-app/main/default/classes/NFM703WebServiceTest.cls
@@ -56,7 +56,7 @@
        cam.Num__c = 'MT-GI-202112-5772';
// StartDate
// EndDate
        cam.Budget_Type__c = '新产品上市';
        cam.Implementation_Purpose__c = '新产品上市';
        cam.OfficeCategory__c = null;
        cam.Meeting_Type__c = '主办会';
        cam.Activity_Type_Name__c = null;
force-app/main/default/classes/NFM705Rest.cls
@@ -25,7 +25,7 @@
        public String Num; //会议编码 == Num__c
        public String StartDate; //开始日期 == StartDate
        public String EndDate; //结束日期 == EndDate
        public String BudgetType; //预算类型 == Budget_Type__c
        public String BudgetType; //预算类型 == Implementation_Purpose__c
        public String OfficeCategory; //科室分类 == OfficeCategory__c
        public String MeetingType; //会议类型 == Meeting_Type__c   
        public String StateMaster; //省 == State_Master__c
@@ -269,7 +269,7 @@
                                if (app.MeetingType__c != '赞助会') {
                                    cam.StartDate                        = app.StartDate__c;
                                    cam.EndDate                          = app.EndDate__c;
                                    cam.Budget_Type__c                   = app.BudgetType__c;
                                    cam.Implementation_Purpose__c                   = app.BudgetType__c;
                                    cam.OfficeCategory__c                = app.OfficeCategory__c;
                                    cam.Meeting_Type__c                  = app.MeetingType__c;
    
@@ -431,7 +431,7 @@
    //     cam.Meeting_Approved_No__c           = app.Id;
    //     cam.StartDate                        = app.StartDate__c;
    //     cam.EndDate                          = app.EndDate__c;
    //     cam.Budget_Type__c                   = app.BudgetType__c;
    //     cam.Implementation_Purpose__c                   = app.BudgetType__c;
    //     cam.OfficeCategory__c                = app.OfficeCategory__c;
    //     cam.Meeting_Type__c                  = app.MeetingType__c;
    //     cam.Activity_Type_Name__c            = app.ActivityTypeName__c;