From a2f7f78e8b02e3613c9ff9cf584de2ec0bda075d Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期四, 12 五月 2022 09:34:08 +0800
Subject: [PATCH] 替换字段

---
 force-app/main/default/classes/NFM705Rest.cls |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/force-app/main/default/classes/NFM705Rest.cls b/force-app/main/default/classes/NFM705Rest.cls
index ea52474..3b39cf6 100644
--- a/force-app/main/default/classes/NFM705Rest.cls
+++ b/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
@@ -131,18 +131,12 @@
                 //     continue;
                 // }
                 meetingApprovedNoList.add(ged.MeetingApprovedNo);
-                if (String.isNotBlank(ged.Num)) {
-                    NumList.add(ged.Num);
-                }
+                // if (String.isNotBlank(ged.Num)) {
+                //     NumList.add(ged.Num);
+                // }
             }
             
             //Map<String,String> campaignMap = new Map<String,String>();
-            List<Campaign> campaignList = NumList.size() > 0 ? [select Id, 
-                                            Num__c, 
-                                            MeetingApprovedNo__c 
-                                        from Campaign 
-                                        where Num__c IN: NumList 
-                                        ] : new List<Campaign>();
             // for(Campaign temp : campaignList){
             //     campaignMap.put(temp.Num__c,temp.Id);
             // }
@@ -176,8 +170,8 @@
                 aca.StateMaster__c                  = ged.StateMaster;
                 aca.CityMaster__c                   = ged.CityMaster;
                 aca.WorkshopPlace__c                = ged.WorkshopPlace;
-                aca.HostName__c                     = ged.HostName;
-                aca.CooperatorCompany__c            = ged.CooperatorCompany;
+                aca.HostName__c                     = String.isBlank(ged.HostName) ? '鏃�' : ged.HostName;
+                aca.CooperatorCompany__c            = String.isBlank(ged.CooperatorCompany) ? '鏃�' : ged.CooperatorCompany;
                 aca.ConveningParticipantsNum__c     = ged.ConveningParticipantsNum;
                 aca.IsPaidToSponsor__c              = NFMUtil.getMapValue(transferMap, 'IsPaidToSponsor__c', string.valueof(ged.IsPaidToSponsor), iflog);
                 aca.SponsorshipCategory__c          = ged.SponsorshipCategory;
@@ -194,7 +188,10 @@
                     aca.Id = oldacfcMap.get(ged.MeetingApprovedNo).Id;
                     aca.Num__c = String.isBlank(aca.Num__c) ? oldacfcMap.get(ged.MeetingApprovedNo).Num__c : aca.Num__c; 
                 } 
-
+                if (String.isNotBlank(aca.Num__c)) {
+                    NumList.add(aca.Num__c);
+                }
+                system.debug('NumList------------->'+NumList);
                 // 纭鐢宠浜�
                 System.debug('aca.Id: ' + aca.Id);
                 if (String.isBlank(aca.Id)) {
@@ -211,10 +208,16 @@
 
                 acaList.add(aca);
             }
-
+            List<Campaign> campaignList = NumList.size() > 0 ? [select Id, 
+                                            Num__c, 
+                                            MeetingApprovedNo__c 
+                                        from Campaign 
+                                        where Num__c IN: NumList 
+                                        ] : new List<Campaign>();
             // 鏌ユ壘鎵�鏈変汉
             if (user_nos != null && user_nos.size() > 0) {
-                users = [select Id, Employee_No__c from User where Employee_No__c in :user_nos];
+                // 2022-03-23 绱ф�ヤ慨澶� 鏈惎鐢ㄧ殑鐢ㄦ埛鏃犳硶璁剧疆鍏变韩
+                users = [select Id, Employee_No__c from User where Employee_No__c in :user_nos and IsActive = true];
                 if (users != null && users.size() > 0) {
                     String owner = '';
                     for (Application_for_Conference_Adjudication__c app : acaList) {
@@ -234,7 +237,6 @@
             if (acaList.size() > 0) {
                 // 鍐欏叆鍐宠淇℃伅
                 upsert acaList;
-
                 // 鍏变韩鏉冮檺
                 SetSharing(users, acaList);
                 // 鑷姩鍒涘缓瀛︿細
@@ -267,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;
     
@@ -429,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;
@@ -510,6 +512,8 @@
         }
         // 鍐嶆柊澧�
         if (insert_list != null && insert_list.size() > 0) {
+            System.debug('insert_list is: ');
+            System.debug(insert_list);
             insert insert_list;
         }
     }

--
Gitblit v1.9.1