From b3dc8e8ce0a120b4f484ef787abd21832c40ec63 Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期日, 24 四月 2022 10:07:34 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/XinDailyReportController.cls | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/XinDailyReportController.cls b/force-app/main/default/classes/XinDailyReportController.cls
index dfc13f6..4d40ade 100644
--- a/force-app/main/default/classes/XinDailyReportController.cls
+++ b/force-app/main/default/classes/XinDailyReportController.cls
@@ -78,7 +78,14 @@
public String repoErrorMessage{get;set;}
public String idParam{get;set;}
public Integer activitiesSize {get;set;}
-
+ //Add By Li Jun 20220224 for PIPL start
+ public String idVisitor1PI{set;get;}
+ public String idVisitor2PI{set;get;}
+ public String idVisitor3PI{set;get;}
+ public String idVisitor4PI{set;get;}
+ public String idVisitor5PI{set;get;}
+ public String staticResource {get; set;}
+ //Add By Li Jun 20220224 for PIPL end
//*************************Create 20160630 OCM-231 瓒欏境鑺� Start*************************//
public String completionFlg{get;set;}
public Daily_Report__c reportBak {get;set;}
@@ -91,8 +98,14 @@
public String etAPPMsg1 {get;set;} // 20210603 zh ETAPP涓庢棩鎶ヨ仈鍔�
public String etAPPMsg2 {get;set;} // 20210603 zh ETAPP涓庢棩鎶ヨ仈鍔�
public String etAPPFlg {get;set;} // 20210603 zh ETAPP涓庢棩鎶ヨ仈鍔�
+ //Add By Li Jun for PIPL 20220225
+ public String contactAWSIds{set;get;}
+ public String acSize{set;get;}
/**銆�銈炽兂銈广儓銉┿偗銈裤��*/
public XinDailyReportController() {
+ PIHelper.PIIntegration piIntegration = PIHelper.getPIIntegrationInfo('Contact');
+ staticResource = JSON.serialize(piIntegration);
+ system.debug('static resource:'+JSON.serialize(staticResource));
EsetId = ApexPages.currentPage().getParameters().get('id');
completionFlg = ApexPages.currentPage().getParameters().get('completion');
eventFlg = ApexPages.currentPage().getParameters().get('event');
@@ -113,6 +126,9 @@
/**銆�銈炽兂銈广儓銉┿偗銈裤��*/
public XinDailyReportController(ApexPages.StandardController controller) {
+ PIHelper.PIIntegration piIntegration = PIHelper.getPIIntegrationInfo('Contact');
+ staticResource = JSON.serialize(piIntegration);
+ system.debug('static resource:'+JSON.serialize(staticResource));
EsetId = ApexPages.currentPage().getParameters().get('id');
completionFlg = ApexPages.currentPage().getParameters().get('completion');
eventFlg = ApexPages.currentPage().getParameters().get('event');
@@ -469,6 +485,35 @@
managerCommentEditFlg = false;
}
reportBak = report;
+ //Add By Li Jun for PIPL 20220225 Start
+
+ List<String> conAWSIds = new List<String>();
+ Set<String> contactIdsForReport = new Set<String>();
+ for(Activity a:activities){
+ if(String.isNotEmpty(a.act.Visitor1_ID__c)&&String.isNotBlank(a.act.Visitor1_ID__c)){
+ contactIdsForReport.add(a.act.Visitor1_ID__c);
+ }
+ if(String.isNotEmpty(a.act.Visitor2_ID__c)&&String.isNotBlank(a.act.Visitor2_ID__c)){
+ contactIdsForReport.add(a.act.Visitor2_ID__c);
+ }
+ if(String.isNotEmpty(a.act.Visitor3_ID__c)&&String.isNotBlank(a.act.Visitor3_ID__c)){
+ contactIdsForReport.add(a.act.Visitor3_ID__c);
+ }
+ if(String.isNotEmpty(a.act.Visitor4_ID__c)&&String.isNotBlank(a.act.Visitor4_ID__c)){
+ contactIdsForReport.add(a.act.Visitor4_ID__c);
+ }
+ if(String.isNotEmpty(a.act.Visitor5_ID__c)&&String.isNotBlank(a.act.Visitor5_ID__c)){
+ contactIdsForReport.add(a.act.Visitor5_ID__c);
+ }
+ system.debug('Activity:'+JSON.serialize(a.act.Visitor1_ID__c));
+ }
+ List<Contact> conListForReport = new List<Contact>([select id,AWS_Data_Id__c from Contact where id in:contactIdsForReport and AWS_Data_Id__c!='']);
+ for(Contact con:conListForReport){
+ conAWSIds.add(con.AWS_Data_Id__c);
+ }
+ contactAWSIds = JSON.serialize(conAWSIds);
+ system.debug('Contact AWSIDs:'+contactAWSIds);
+ //Add By Li Jun for PIPL 20220225 End
return null;
}
@@ -688,6 +733,7 @@
Purpose_Type__c = e.Purpose_Type__c,
Related_Opportunity1__c = e.Related_Opportunity1__c,
OPDPlan_Flag__c = e.OPDPlan_Flag__c,
+ Opd_Plan__c = e.Opd_Plan__c, //2022-4-14 yjk 澧炲姞opd璁″垝
Related_Opportunity1_ID__c = e.Related_Opportunity1_ID__c,
Related_Opportunity2__c = e.Related_Opportunity2__c,
Related_Opportunity2_ID__c = e.Related_Opportunity2_ID__c,
@@ -1252,7 +1298,8 @@
//2021-10-15 mzy 浠诲姟绠＄悊鏀瑰杽 end
) {
if (!String.isBlank(a.act.Activity_Type2__c) && a.act.Activity_Type2__c == '鐥呴櫌'
- && a.act.Free_Input__c == false && String.isBlank(a.act.Visitor1__c)) {
+ && a.act.Free_Input__c == false && String.isBlank(a.act.Visitor1_ID__c)) { //Add By Chen Yanan 20220325 for PIPL
+ // && a.act.Free_Input__c == false && String.isBlank(a.act.Visitor1__c)) {
a.act.Visitor1__c.addError('璇疯嚦灏戝～鍐欎竴浣嶈闂璞�');
eventFlg = true;
}
@@ -2294,18 +2341,17 @@
if('鐢宠珛涓�'.equals(report.Status__c )){
XinDailyReportController.updateTask( report.id);
//sla淇℃伅鏇存柊 zh start
-
//2021-08-27 鏉ㄦ澃鍏� 淇敼閫昏緫锛氭槸鍚﹂�炬湡閮借皟鐢╯aveSLADetails鏂规硶锛屽皢鏄惁閫炬湡浼犲叆鏂规硶锛屾柟娉曞唴鍋氶�昏緫澶勭悊
if (eventCAndSLA.size()>0 && SLAIds.size()>0) {
UpdateSLACompleteNumber.saveSLADetails(eventCAndSLA, SLAIds,report.Submit_DateTime_New__c <= report.Report_Deadline__c );
}
if (report.Submit_DateTime_New__c <= report.Report_Deadline__c ) { //鎻愪氦鏃ヨ秴杩囨渶鍚庢彁浜ゆ湡闄愶紝涓嶈鍏ユ鏁�
-
if (eventCAndMainC.size()>0 && mainCIds.size()>0) {
UpdateSLACompleteNumber.saveSLARecorded(eventCAndMainC, mainCIds);
}
}
+
//sla淇℃伅鏇存柊 zh end
// 浠诲姟妗嗘灦bug 搴斿 by zys start 鍘熶唬鐮�
@@ -3549,7 +3595,7 @@
if(insertCancelPostponePlan.size() > 0){
insert insertCancelPostponePlan;
}
-
+
}catch(Exception ex){
logstr += '\n' + ex.getMessage();
//2022-02-07 mzy 鏃ュ織淇敼 start
@@ -3621,6 +3667,9 @@
// 20200420 浠诲姟鏃ユ姤绠＄悊 add gzw end
activities.add(a);
actSize = activities.size();
+ //Add log by Li Jun 20220407 Start
+ system.debug('Activity Data:'+JSON.serialize(activities));
+ //Add log by Li Jun 20220407 end
}
public String delIndex {
--
Gitblit v1.9.1