From fd9df05c48c09b4d7f39a3b401882bda226dedea Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 31 十月 2023 20:38:18 +0800
Subject: [PATCH] 近期修改

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

diff --git a/force-app/main/default/classes/OpportunityService.cls b/force-app/main/default/classes/OpportunityService.cls
index 063be70..3ee2026 100644
--- a/force-app/main/default/classes/OpportunityService.cls
+++ b/force-app/main/default/classes/OpportunityService.cls
@@ -10,7 +10,7 @@
   // IdStr 鎷涙姇鏍囩殑ID
   //hospital 鍖婚櫌鐨処D
   @AuraEnabled
-  public  static string GetNormalProductDataSearch(String noStr,String accountId,String IdStr,String hospital,String[] hospitalArr, String departments) {
+  public  static string GetNormalProductDataSearch(String noStr,String accountId,String IdStr,String inputText,String hospital,String[] hospitalArr, String departments) {
 
     String sql = 'select ';
     // sql += CommonUtils.GetSqlToPorps(Opportunity.SObjectType);
@@ -25,9 +25,13 @@
       sql += ' and Opportunity_No__c = :noStr';
     }
 
-    if(hospitalArr!= null && hospitalArr.size() > 0)
+    // if(hospitalArr!= null && hospitalArr.size() > 0)
+    // {
+    //   sql += ' and Hospital__c in :hospitalArr';
+    // }
+    if(inputText!= null && inputText!= '')
     {
-      sql += ' and Hospital__c in :hospitalArr';
+      sql += ' and HP_Name__c LIKE  \'%' + inputText + '%\' ';
     }
     if(hospital != null && hospital != '' && hospital != ' ')
     {
@@ -137,6 +141,7 @@
     //DB202305552102  you 202305230 闄や簡鐩爣鐨勯兘鐪�
     //DB202309608863  chenjingwu 2023/10/11 鎷涙爣椤圭洰寰呭叧鑱旇浠蜂腑鎺掗櫎鍙樻洿鐢ㄦ埛璇环
     sql += ' and If_Account_Change__c = false';
+    sql += ' and ((SFDCLast_Process_Date__c = null and stageName not in (\'鍑鸿嵎\',\'瀹屼簡\',\'鍓婇櫎\',\'鏁楁垿\')) or SFDCLast_Process_Date__c >= LAST_N_DAYS:730)';
     //DB202309608863  chenjingwu 2023/10/11 鎷涙爣椤圭洰寰呭叧鑱旇浠蜂腑鎺掗櫎鍙樻洿鐢ㄦ埛璇环
     sql += ' order by stageName limit 200';
     System.debug('sql2:'+sql);

--
Gitblit v1.9.1