From 9b197b7fac92278fb591ea8f4942c7d5687cb5ce Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期一, 28 三月 2022 18:01:22 +0800
Subject: [PATCH] LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备0328
---
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