20220419FixIssue

Li Jun

2022-04-19 2f183a6b0a83ec3f7d35375d5d25d200efc2a3e1

 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 杨杰克 修改逻辑：是否逾期都调用saveSLADetails方法，将是否逾期传入方法，方法内做逻辑处理
                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 {