parent: db8e77d6 | 补丁 | 提交 | ignore whitespace
denny chen
2023-03-29 6a471bc62a8567abd74dcef733fcddf9911b6a16 
Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
5个文件已修改
543 ■■■■■ 已修改文件
force-app/main/default/classes/ControllerUtil.cls 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/OdsToUserHandler.cls 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/OpdAmountBatch.cls 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/RepairTrigger.cls 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/RollupToHPBatch.cls 493 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 force-app/main/default/classes/ControllerUtil.cls


@@ -5699,7 +5699,7 @@


            //20210826 mzy SWAG-C5S46P start


            //改为用 发货完毕日 判断 且 将 2012年创建的且询价状态是发货/完毕的数据排除


            //queryString = 'Select Id, Opportunity_No__c, Name, toLabel(StageName), Department_Name__c,Field1__c,CountNoInstall__c, Close_Forecasted_Date__c, Competitor__c, Wholesale_Price__c from Opportunity where' + nameCondition + ' Account.Hospital__c=\'' + a.Hospital__c + '\' and ( StageName IN (\'引合\',\'注残\') or ( StageName = \'出荷\' and Shipping_Finished_Day__c > '+temptoday+' and Shipping_Finished_Day__c <= '+tempLastDate+' and CALENDAR_YEAR(Created_Day__c) != 2012 )) and RecordTypeId in (\'01210000000QekK\',\'012100000006KMeAAM\') order by Name, Opportunity_No__c, Department_Name__c limit 31';


            queryString = 'Select Id, Opportunity_No__c, Name, toLabel(StageName), Department_Name__c,Field1__c,CountNoInstall__c, Close_Forecasted_Date__c, Competitor__c, Wholesale_Price__c from Opportunity where' + nameCondition + ' Account.Hospital__c=\'' + a.Hospital__c + '\' and ( StageName IN (\'引合\',\'注残\') or ( StageName = \'出荷\' and Shipping_Finished_Day__c > '+tempLastDate+' and Shipping_Finished_Day__c <= '+temptoday+' and CALENDAR_YEAR(Created_Day__c) != 2012 )) and RecordTypeId in (\'01210000000QekK\',\'012100000006KMeAAM\') order by Name, Opportunity_No__c, Department_Name__c limit 31';


            queryString = 'Select Id, Opportunity_No__c, Name, toLabel(StageName), Department_Name__c,Field1__c,Close_Forecasted_Date__c, Competitor__c, Wholesale_Price__c from Opportunity where' + nameCondition + ' Account.Hospital__c=\'' + a.Hospital__c + '\' and ( StageName IN (\'引合\',\'注残\') or ( StageName = \'出荷\' and Shipping_Finished_Day__c > '+tempLastDate+' and Shipping_Finished_Day__c <= '+temptoday+' and CALENDAR_YEAR(Created_Day__c) != 2012 )) and RecordTypeId in (\'01210000000QekK\',\'012100000006KMeAAM\') order by Name, Opportunity_No__c, Department_Name__c limit 31';


            //20210826 mzy SWAG-C5S46P end


            // 20200616 CHAN-BQM8LU vivek end


        }


@@ -5718,7 +5718,7 @@


            //20210826 mzy SWAG-C5S46P start


            //改为用 发货完毕日 判断 且 将 2012年创建的且询价状态是发货/完毕的数据排除


            //queryString = 'Select Id, Opportunity_No__c, Name, toLabel(StageName), Department_Name__c,Field1__c,CountNoInstall__c, Close_Forecasted_Date__c, Competitor__c, Wholesale_Price__c from Opportunity where' + nameCondition + ' Account.Hospital__c=\'' + a.Hospital__c + '\' and ( StageName IN (\'引合\',\'注残\') or ( StageName = \'出荷\' and Shipping_Finished_Day__c > '+temptoday+' and Shipping_Finished_Day__c <= '+tempLastDate+' and CALENDAR_YEAR(Created_Day__c) != 2012 )) and RecordTypeId in (\'01210000000QekK\',\'012100000006KMeAAM\') order by Name, Opportunity_No__c, Department_Name__c limit 31';


            queryString = 'Select Id, Opportunity_No__c, Name, toLabel(StageName), Department_Name__c,Field1__c,CountNoInstall__c, Close_Forecasted_Date__c, Competitor__c, Wholesale_Price__c from Opportunity where' + nameCondition + ' Account.Hospital__c=\'' + a.Hospital__c + '\' and ( StageName IN (\'引合\',\'注残\') or ( StageName = \'出荷\' and Shipping_Finished_Day__c > '+tempLastDate+' and Shipping_Finished_Day__c <= '+temptoday+' and CALENDAR_YEAR(Created_Day__c) != 2012 )) and RecordTypeId in (\'01210000000QekK\',\'012100000006KMeAAM\') order by Name, Opportunity_No__c, Department_Name__c limit 31';


            queryString = 'Select Id, Opportunity_No__c, Name, toLabel(StageName), Department_Name__c,Field1__c, Close_Forecasted_Date__c, Competitor__c, Wholesale_Price__c from Opportunity where' + nameCondition + ' Account.Hospital__c=\'' + a.Hospital__c + '\' and ( StageName IN (\'引合\',\'注残\') or ( StageName = \'出荷\' and Shipping_Finished_Day__c > '+tempLastDate+' and Shipping_Finished_Day__c <= '+temptoday+' and CALENDAR_YEAR(Created_Day__c) != 2012 )) and RecordTypeId in (\'01210000000QekK\',\'012100000006KMeAAM\') order by Name, Opportunity_No__c, Department_Name__c limit 31';


            //20210826 mzy SWAG-C5S46P end


            // 20191126 SWAG-BJA6JK LHJ End


            // 20200616 CHAN-BQM8LU vivek end


@@ -5801,6 +5801,17 @@


    }


    // FY23修改 WLIG-CFV4AV 重点产品维护（新）end




    // DB202303051651 产品报价金额自动计算 ssm start


    // Json解析


    public static String getValueFromJSONString(String jsonstring, String key) {


        if (String.isNotBlank(jsonstring)) {


            Map<String, Object> mapping = (Map<String, Object>) JSON.deserializeUntyped(jsonstring);


            return mapping.get(key) != null ? String.valueOf(mapping.get(key)) : mapping.get('Default') != null ? String.valueOf(mapping.get('Default')) : null;


        }


        return null;


    }


    // DB202303051651 产品报价金额自动计算 ssm end




    //20221021  lt SWAG-CHL5XA【FY23询价改善】-统计主机台数 start


    public static void UpdateBiddingFlag(List<String> oppId){


        List<Tender_Opportunity_Link__c> links = [SELECT Id, Tender_information__c, Tender_information__r.IsReactionOpp__c, Opportunity__c 




 force-app/main/default/classes/OdsToUserHandler.cls


@@ -30,7 +30,11 @@


    }




    protected override void afterUpdate() {


        UpsertUser();


        //20230317 you 增加hr信息同步user 开关


        if (System.label.HrODSTOUser.equals('true')) {


            UpsertUser();


        }


        


    }








 force-app/main/default/classes/OpdAmountBatch.cls


@@ -356,6 +356,11 @@


                                  ,Dealer_Final_Price__c


                                  ,HospitalTransactionAmount__c


                                  //20230222   DB202302339407 you end


                                  //20230327  DB202303372329 you start


                                  ,OP_ThousandY_Order__c


                                  ,OrderThisYearQY__c


                                  ,Opportunity__c


                                  //20230327  DB202303372329 you end


                                  from Account2__c


                                  where Account_Org__c = :dcList];


  


@@ -508,6 +513,12 @@


      accTar.Opportunity_ThousandY__c       = acc2.Opportunity_ThousandY__c;


      accTar.Amount_Without_Tax_Thousand__c = acc2.Amount_Without_Tax_Thousand__c;




       //20230327  DB202303372329 you start


       accTar.OP_ThousandY_Order__c        = acc2.OP_ThousandY_Order__c;


       accTar.OrderThisYearQY__c        = acc2.OrderThisYearQY__c;


       accTar.Opportunity__c        = acc2.Opportunity__c;


       //20230327  DB202303372329 you end




      //20220111 SWAG-C8MBB6 加7.询价 lt  start


      accTar.AllOP_ThousandY__c = acc2.AllOP_ThousandY__c;


      //20220111 SWAG-C8MBB6 加7.询价 lt  end




 force-app/main/default/classes/RepairTrigger.cls


@@ -406,12 +406,14 @@


                            }


                        }


                    }else if(repair.On_site_repair__c == '办事处修理' || repair.On_site_repair__c== '现场修理'){


                        if(repair.Sales_Branch__c == '上海分公司'){


                      /** 20230313 you DB202303171085


                       if(repair.Sales_Branch__c == '上海分公司'){


                            if (hzProvince.contains(repair.SalesOfficeCode_selection__c)) {


                                repair.work_location_select__c = '杭州共通办事处';


                                leakDefaultFlag = false;


                            }


                        } else if(repair.Sales_Branch__c == '广州分公司'){


                        } else **/


                        if(repair.Sales_Branch__c == '广州分公司'){


                            if (cdProvince.contains(repair.SalesOfficeCode_selection__c)) {


                                repair.work_location_select__c = '成都共通办事处';


                                leakDefaultFlag = false;


@@ -477,12 +479,14 @@


                                leakDefaultFlag = false;


                            }


                        }else if(repair.On_site_repair__c == '办事处修理' || repair.On_site_repair__c== '现场修理'){


                           /** 20230313 you DB202303171085


                            if(repair.Contract_Principal_Office__c == '上海RC'){


                                if (hzProvince.contains(repair.SalesOfficeCode_selection__c)) {


                                    repair.work_location_select__c = '杭州共通办事处';


                                    leakDefaultFlag = false;


                                }


                            } else if(repair.Contract_Principal_Office__c == '广州RC'){


                            } else **/


                            if(repair.Contract_Principal_Office__c == '广州RC'){


                                if (cdProvince.contains(repair.SalesOfficeCode_selection__c)) {


                                    repair.work_location_select__c = '成都共通办事处';


                                    leakDefaultFlag = false;


@@ -591,13 +595,15 @@


                            }


                        }


                     }else if(repair.On_site_repair__c == '办事处修理' || repair.On_site_repair__c== '现场修理'){


                        /** 20230313 you DB202303171085


                        if(repair.Sales_Branch__c == '上海分公司'){


                            //根据修理品返送地为非北京


                            if (hzProvince.contains(repair.SalesOfficeCode_selection__c)) {


                                repair.work_location_select__c = '杭州共通办事处';


                                leakDefaultFlag = false;


                            }


                        } else if(repair.Sales_Branch__c == '广州分公司'){


                        } else **/


                        if(repair.Sales_Branch__c == '广州分公司'){


                            //根据修理品返送地为非北京


                            if (cdProvince.contains(repair.SalesOfficeCode_selection__c)) {


                                repair.work_location_select__c = '成都共通办事处';


@@ -667,12 +673,14 @@


                                leakDefaultFlag = false;


                            }


                        }else if(repair.On_site_repair__c == '办事处修理' || repair.On_site_repair__c== '现场修理'){


                           /** 20230313 you DB202303171085


                            if(middleTable.Maintenance_Contract__r.SalesOfficeCode_selection__c == '上海RC'){


                                if (hzProvince.contains(repair.SalesOfficeCode_selection__c)) {


                                    repair.work_location_select__c = '杭州共通办事处';


                                    leakDefaultFlag = false;


                                }


                            } else if(middleTable.Maintenance_Contract__r.SalesOfficeCode_selection__c == '广州RC'){


                            } else**/


                            if(middleTable.Maintenance_Contract__r.SalesOfficeCode_selection__c == '广州RC'){


                                if (cdProvince.contains(repair.SalesOfficeCode_selection__c)) {


                                    repair.work_location_select__c = '成都共通办事处';


                                    leakDefaultFlag = false;




 force-app/main/default/classes/RollupToHPBatch.cls


@@ -779,6 +779,11 @@


           ,order_Date_For_Report__c


           ,StageName__c


           //20230222   DB202302339407 you end 


           //20230327  DB202303372329 you start


           ,OP_ThousandY_Order__c


           ,OrderThisYearQY__c


           ,Opportunity__c


           //20230327  DB202303372329 you end


           from Opportunity


           where Hospital__c in :hpList


         ]) {


@@ -826,8 +831,14 @@


        o10 = o8 + o9;


      }


      //20230222 you end


      setOppAmount(hpacc, o1, o2, o3, o4, o5, o6, o7,o8,o9,o10);


      setOppAmount(dcacc, o1, o2, o3, o4, o5, o6, o7,o8,o9,o10);


      //20230327  DB202303372329 you start


      Decimal o11 = opp.OP_ThousandY_Order__c == null ? 0 : opp.OP_ThousandY_Order__c;


      Decimal o12 = opp.OrderThisYearQY__c == null ? 0 : opp.OrderThisYearQY__c;


      Decimal o13 = opp.Opportunity__c == null ? 0 : opp.Opportunity__c;


      


      //20230327  DB202303372329 you end


      setOppAmount(hpacc, o1, o2, o3, o4, o5, o6, o7,o8,o9,o10,o11,o12,o13);


      setOppAmount(dcacc, o1, o2, o3, o4, o5, o6, o7,o8,o9,o10,o11,o12,o13);




    }




@@ -1409,6 +1420,12 @@


    acc.Opportunity_ThousandY__c = 0;


    acc.Amount_Without_Tax_Thousand__c = 0;




    //20230327  DB202303372329 you start


    acc.OP_ThousandY_Order__c = 0;


    acc.OrderThisYearQY__c =0;


    acc.Opportunity__c =0;


    //20230327  DB202303372329 you end




    //20220111 SWAG-C8MBB6 加7.询价 lt  start


    acc.AllOP_ThousandY__c = 0;


    //20220111 SWAG-C8MBB6 加7.询价 lt  end


@@ -1815,7 +1832,7 @@


    acc.ShippedAmount_HP__c += sa;


  }




  private void setOppAmount(Account2__c acc, Decimal o1, Decimal o2, Decimal o3, Decimal o4, Decimal o5, Decimal o6, Decimal o7,Decimal o8,Decimal o9,Decimal o10) {


  private void setOppAmount(Account2__c acc, Decimal o1, Decimal o2, Decimal o3, Decimal o4, Decimal o5, Decimal o6, Decimal o7,Decimal o8,Decimal o9,Decimal o10,Decimal o11,Decimal o12,Decimal o13) {


    acc.Opp_Actual_ThousandY__c += o1;


    acc.BO_Forecast_ThousandY__c += o2;


    acc.OP_ThousandY__c += o3;


@@ -1831,6 +1848,11 @@


    acc.HospitalTransactionAmount__c += o10;




    //20230222 you end


    //20230327  DB202303372329 you start


    acc.OP_ThousandY_Order__c += o11;


    acc.OrderThisYearQY__c += o12;


    acc.Opportunity__c += o13;


    //20230327  DB202303372329 you end


  }




  private void setOpdIproductCount(Account2__c acc, Decimal decIP1, Decimal decIP2, Decimal decIP3, Decimal decIP4, Decimal decIP5, Decimal decIP6, Decimal decIP7, Decimal decIP8, Decimal decIP9, Decimal decIP10,


@@ -2396,5 +2418,470 @@


      countImportantProduct(acc,nameType,tmpCnt,tmpKey,allList,departmentE,depToOtherDepAcc2Map, updateAccount, OldAccount2);


    


  }


   @TestVisible private static void test() {


        Integer i = 0;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


}


  


}