From e3a2cee90bc35685b1ebc88af96c5c65289a55fe Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期三, 29 三月 2023 14:01:21 +0800
Subject: [PATCH] 20230329-询价中的今年相关字段增加和修改+现场修理逻辑+停止hr信息同步用户

---
 force-app/main/default/classes/RepairTrigger.cls |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/classes/RepairTrigger.cls b/force-app/main/default/classes/RepairTrigger.cls
index 8a1a238..e84bd95 100644
--- a/force-app/main/default/classes/RepairTrigger.cls
+++ b/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;

--
Gitblit v1.9.1