From ba79bb0403f5347ba5c8cf73271521fa7aedbac6 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期六, 12 三月 2022 13:52:02 +0800
Subject: [PATCH] 1.707接口bug修正和test覆盖率提升 2.会议决裁申请触发器处理类的修改和新增test类

---
 force-app/main/default/classes/NFM707Rest.cls |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/classes/NFM707Rest.cls b/force-app/main/default/classes/NFM707Rest.cls
index 4b8fdd4..957446d 100644
--- a/force-app/main/default/classes/NFM707Rest.cls
+++ b/force-app/main/default/classes/NFM707Rest.cls
@@ -135,15 +135,20 @@
                 // if (campaignMap.size() > 0) {
                 //     update campaignMap.values();
                 // }
-                List<Campaign> camNoList = [select id,Num__c,MeetingApprovedNo__c,Meeting_Approved_No__c, CampaignStatus__c 
+                List<Campaign> camNoList = [select id,Num__c,MeetingApprovedNo__c,Meeting_Approved_No__c, Meeting_Approved_No__r.MeetingApprovedNo__c, CampaignStatus__c 
                                     from Campaign 
-                                    where MeetingApprovedNo__c in: camList and CampaignStatus__c = '浼氳缁撴潫'];
+                                    where Meeting_Approved_No__r.MeetingApprovedNo__c in: camList and CampaignStatus__c = '浼氳缁撴潫'];
+                // System.debug(camNoList);
                 if (camNoList != null && camNoList.size() > 0) {
                     List<String> cam_ids = new List<String>();
                     for(Campaign cam : camNoList) {
+                        // System.debug('cam: ' + cam.Num__c + '|' + cam.Meeting_Approved_No__c + '|' + cam.Meeting_Approved_No__r.MeetingApprovedNo__c);
+                        Application_for_Conference_Adjudication__c app = acaMap.get(cam.Meeting_Approved_No__r.MeetingApprovedNo__c);
+                        // System.debug('app: ' + (app != null ? app.Id : 'null'));
                         cam_ids.add(cam.id);
                         for (Result_for_Conference_Adjudication__c rca : rcaList) {
-                            if (cam.Meeting_Approved_No__c == rca.Application_for_Conference_Adjudication__c) {
+                            // System.debug('rca: ' + rca.Application_for_Conference_Adjudication__c);
+                            if (cam.Meeting_Approved_No__c == rca.Application_for_Conference_Adjudication__c || (app != null && app.Id == rca.Application_for_Conference_Adjudication__c)) {
                                 // 鏇存柊浼氳鏃ョ▼
                                 cam.Meeting_Report__c = rca.Id;
                                 cam.Society_Hold_Place__c = rca.SocietyHoldPlace__c;

--
Gitblit v1.9.1