From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/RentalApplySplitController.cls | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/RentalApplySplitController.cls b/force-app/main/default/classes/RentalApplySplitController.cls
index 5f20eaa..87b4041 100644
--- a/force-app/main/default/classes/RentalApplySplitController.cls
+++ b/force-app/main/default/classes/RentalApplySplitController.cls
@@ -381,6 +381,16 @@
List<Rental_Apply_Equipment_Set_Detail__c> raesdList = [select Id, Rental_Apply_Equipment_Set__c
from Rental_Apply_Equipment_Set_Detail__c
where Rental_Apply_Equipment_Set__c in :ids];
+
+ //DB202212459027 銆怓Y23涓皬璇鹃銆戝埌璐G鍒嗗崟棣栨弧鐜囪皟鏁� 2023/01/06 lc Start
+ if(cloneRas.Split_Apply_Reason__c.equals('鍒拌揣NG鍒嗗崟')){
+ // 鎵瑰噯鏃堕棿(鐢宠鎻愪氦鏃堕棿)
+ cloneRas.Request_approval_time__c = DateTime.now();
+ // 鐢宠鍙楃悊鏃堕棿(鍥炵瓟鏃堕棿)
+ cloneRas.Application_accept_time__c = null;
+ }
+ //DB202212459027 銆怓Y23涓皬璇鹃銆戝埌璐G鍒嗗崟棣栨弧鐜囪皟鏁� 2023/01/06 lc End
+
if(this.ra.RecordTypeId == DEVELOPERNAMEMAP.get('AgencyRequest').getRecordTypeId()
&& !String.isBlank(cloneRas.Split_Apply_Reason__c) && !cloneRas.Split_Apply_Reason__c.equals('鐜板湴绠＄悊鍒嗗崟')){
// 1.鍒嗘壒鍙戣揣鍒嗗崟 2.鍒拌揣NG鍒嗗崟
@@ -552,6 +562,9 @@
Meeting_Cooperate2__c, //浼氳鍚堜綔鏈儴2
Meeting_Cooperate3__c, //浼氳鍚堜綔鏈儴3
Meeting_Cooperate4__c, //浼氳鍚堜綔鏈儴4
+ IF_Approved__c, // 鏄惁鐢宠鍐宠 20220218 ljh add
+ Approved_No__c, // 鍐宠缂栫爜 20220218 ljh add
+ Approved_Status__c,// 鍐宠鐘舵�� 20220218 ljh add
AdditionalSupport__c //鍘烵PD璁″垝锛堣拷鍔犻厤濂楃敤锛�
FROM OPDPlan__c WHERE Id = :cloneRas.OPDPlan__c];
if(opdList.size()>0){
@@ -562,6 +575,8 @@
cloneOPD.Status__c = '璁″垝涓�';
FixtureUtil.withoutInsert(new OPDPlan__c[]{cloneOPD});
cloneRas.OPDPlan__c = cloneOPD.Id;
+ // cloneRas.ApprovedNo_Create__c = cloneOPD.Approved_No__c; // 20220218 ljh add 鍐宠
+ // cloneRas.Approved_State_Create__c = cloneOPD.Approved_Status__c; // 20220218 ljh add 鍐宠
// List<Plan_Rental_Equipment__c> inPreList = new List<Plan_Rental_Equipment__c>();
// for(Plan_Rental_Equipment__c pre0 : [SELECT Id, Campaign__c,Event_ID__c,RecordTypeId,Name,Rental_Equipment__c,Rental_Quantity__c FROM Plan_Rental_Equipment__c WHERE OPD_Plan__c = :opdList[0].Id]){
// Plan_Rental_Equipment__c pre = new Plan_Rental_Equipment__c();
@@ -602,6 +617,7 @@
cloneRas.Old_Rental_Apply__c = ra.Id; // 婧愮敵璇峰崟Link
cloneRas.Root_Rental_Apply__c = rootRaList[0].Id; // 鏈�婧愮敵璇峰崟Id 20210609 ljh add 1732
cloneRas.OPDManagerText__c = ra.OPDManager__c; // 20210926 ljh add SFDC-C6A97F add
+ cloneRas.OPDBuchang_Text__c = ra.OPDBuchang__c; // 20220722 zyh add SWAG-CGG7X9 add
//20201117 ljh OCSM_BP5-60 add start
//4.鍔炰簨澶勫垎閰嶅垎鍗曞嚭鏉ョ殑澶囧搧鍊熷嚭鐢宠锛屾暟鎹被鍨嬮渶瑕佷慨鏀�
if(cloneRas.Split_Apply_Reason__c != null && cloneRas.Split_Apply_Reason__c.equals('鐜板湴绠＄悊鍒嗗崟')){
@@ -689,6 +705,7 @@
OCM_segmentation__c, // OCM鍒嗙被
Loaner_medical_Staff__c, // 绉戝璐熻矗浜�
Phone_number__c, // 鑱旂郴鐢佃瘽
+ Phone_Number_Encrypt__c, // 20220401 PI COPY by Bright
// ------ 鍊熺敤澶囧搧鐨勭洰鐨� ------
Demo_purpose1__c, // 浣跨敤鐩殑1
demo_purpose2__c, // 浣跨敤鐩殑2
@@ -723,11 +740,15 @@
Loaner_received_staff__c, // 鏀朵欢鑰呭鍚� (閿�鍞垨FSE)
Shippment_adress_detail__c, // 鍙戦�佸姙浜嬪鍦板潃璇︾粏
direct_shippment_address__c, // 鐩撮�佸彂閫佸湴鍧�
+ Direct_Shippment_Address_Encrypt__c, // 20220401 PI COPY by Bright
direct_send__c, // 鍙戦�佹柟
pickup_time__c, // 鑷彁鏃堕棿
Loaner_received_staff_phone__c, // 鏀朵欢鑰呯數璇�(閿�鍞垨FSE)
Post_Code__c, // 閭紪
-
+ // ApprovedNo_Delivery__c, // 鍐宠缂栧彿锛堝彂璐ф椂锛� 20220224 ljh add
+ // Approved_State_Delivery__c, // 鍐宠鐘舵�侊紙鍙戣揣鏃讹級20220224 ljh add
+ ApprovedNo_Create__c, // 鍐宠缂栧彿锛堝垱寤烘椂锛� 20220301 ljh add
+ Approved_State_Create__c, // 鍐宠鐘舵�侊紙鍒涘缓鏃讹級 20220301 ljh add
Response__c, // 搴旂瓟娌熼��
Request_demo_time__c, // 鐢宠鏃堕棿
Request_approval_time__c, // 鎵瑰噯鏃堕棿锛堢敵璇锋彁浜ゆ椂闂达級
@@ -739,6 +760,7 @@
First_level_actual_approver__c, //涓�绾у疄闄呭鎵逛汉 20210908 ljh SFDC-C6A97F add
Second_level_actual_approver__c, //浜岀骇瀹為檯瀹℃壒浜� 20210908 ljh SFDC-C6A97F add
OPDManager__c, // 20210926 ljh add SFDC-C6A97F add
+ OPDBuchang__c, // 20220722 zyh add SWAG-CGG7X9 add
// OLY_OCM-583 Start 鍒嗗崟鏃跺鍔犳嫹璐濆瓧娈礕I鏈儴鍖哄垎
GI_Diff__c // GI鏈儴鍖哄垎
// OLY_OCM-583 End
--
Gitblit v1.9.1