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/RentalFixtureSetAssignController.cls | 49 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/force-app/main/default/classes/RentalFixtureSetAssignController.cls b/force-app/main/default/classes/RentalFixtureSetAssignController.cls
index dcd2a3f..af3c046 100644
--- a/force-app/main/default/classes/RentalFixtureSetAssignController.cls
+++ b/force-app/main/default/classes/RentalFixtureSetAssignController.cls
@@ -77,11 +77,9 @@
}
// 20211203 ljh add end
// 鐢婚潰閲岀洿鎺ュ彲浠ヨ緭鍏ョ殑闋呯洰 List
- // 20220211 ljh update FY23璇鹃01 start
- // public override List<String> getWritableColumnFieldList() {
- // return new List<String>{'Rental_Start_Date__c', 'Rental_End_Date__c'};
- // }
- // 20220211 ljh update FY23璇鹃01 end;
+ public override List<String> getWritableColumnFieldList() {
+ return new List<String>{'Rental_Start_Date__c', 'Rental_End_Date__c'};
+ }
// getObjName 杩� getOriginObjName 鐨� FK
public override String getFKColumnField() {
return null;
@@ -292,13 +290,18 @@
// update銇犮亼浣跨敤銇欍倠
List<Rental_Apply_Equipment_Set__c> mfUpdate = new List<Rental_Apply_Equipment_Set__c>();
Savepoint sp = Database.setSavepoint();
+ List<String> statusList = System.Label.StatusProcessState.split(',');
try {
Boolean updRAFlg = false;
Rental_Apply__c raUpd = [
SELECT Id, Shipment_request_Cnt__c,
Asset_loaner_start_day__c,
- Asset_loaner_closed_day__c
+ Asset_loaner_closed_day__c,
+ Campaign__c,
+ Campaign__r.IF_Approved__c,
+ Campaign__r.Meeting_Approved_No__c,
+ Campaign__r.Approved_Status__c //2022 sx obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
FROM Rental_Apply__c
WHERE Id = :parentId
FOR Update];
@@ -313,6 +316,15 @@
}
}
+ //20220228 sx obpm淇敼 鏄惁鐢宠鍐宠鍕剧潃娌℃湁鍐宠缂栧彿涓嶈兘杩涜鎿嶄綔
+ if( raUpd.Campaign__c!= null && raUpd.Campaign__r.IF_Approved__c && raUpd.Campaign__r.Meeting_Approved_No__c == null){
+ throw new ControllerUtil.myException('宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖');
+ }
+ //20220315 sx obpm obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� start
+ else if( raUpd.Campaign__c!= null && raUpd.Campaign__r.IF_Approved__c && raUpd.Campaign__r.Meeting_Approved_No__c != null && statusList.contains(raUpd.Campaign__r.Approved_Status__c) ){
+ throw new ControllerUtil.myException('宸茬敵璇峰喅瑁佷絾鍐宠鐘舵�佷笉绗﹀悎鏉′欢');
+ }
+ //20220315 sx obpm obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� end
Integer indexNum = 1;
// 20210708 ljh SFDC-C47CLV add start
Set<Id> raeIdset = new Set<Id>();
@@ -324,6 +336,7 @@
raeIdset.add(robj.Id);
}
}
+
List<Rental_Apply_Equipment_Set__c> raeList = [SELECT Id, Name,Rental_Apply__c,Cancel_Select__c,LastModifiedDate FROM Rental_Apply_Equipment_Set__c where Id in :raeIdset];
// 20210906 ljh SFDC-C6D9C2 add LastModifiedDate
for(Rental_Apply_Equipment_Set__c rae:raeList){
@@ -346,6 +359,7 @@
hasError = true;
throw new ControllerUtil.myException('绗�' + indexNum +'琛屾暟鎹凡琚垎鍓茬敵璇峰崟锛岃鍒锋柊鍚庨噸璇曪紒');
}
+
// 20210708 ljh update end
// 20210906 ljh SFDC-C6D9C2 add start
// 20210929 ljh SFDC-C6D9C2 娉ㄩ噴 鎭㈠鏀瑰叾浠栨柟妗� start
@@ -887,7 +901,7 @@
}
}
}
- update queueList;
+ FixtureUtil.withoutUpdate(queueList);
List<String> nodusequencekeylist = new List<String>(new Set<String>(sequencekeylist));
List<Rental_Apply_Sequence__c> updateSequenceList = new List<Rental_Apply_Sequence__c>();
List<Rental_Apply_Sequence__c> applysequenceList = [SELECT Id,ExternalKey__c,Demo_Purpose2__c,
@@ -926,7 +940,7 @@
}
}
- update updateSequenceList;
+ FixtureUtil.withoutUpdate(updateSequenceList);
}
}
@@ -1047,6 +1061,9 @@
applyObj.campaignType = parentObj.CampaignType__c;
obj = getdefultInfo(raesd,applyObj,bieCunFangDi);
}else{
+ // Modify by Liu 20220908 Solution鏈儴璇鹃瀵瑰簲 start
+ salesdepartments = salesdepartments.replace('16.Solution鏈儴', '16.娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴');
+ // Modify by Liu 20220908 Solution鏈儴璇鹃瀵瑰簲 end
obj = getSpecialInfo(raesd,parentObj,salesdepartments,equipmenttypes);
}
System.debug(LoggingLevel.INFO, '*11** index: ' + index);
@@ -1193,9 +1210,11 @@
updateList.addAll(queueList);
System.debug(LoggingLevel.INFO, '***old updateList: ' + updateList.size());
+ System.debug(LoggingLevel.INFO, '***old updateList.detail: ' + updateList);
updateList = Batch_QueueAllDetail.getSortDetailList(updateList);
System.debug(LoggingLevel.INFO, '*** updateList: ' + updateList.size());
- update updateList;
+ System.debug(LoggingLevel.INFO, '*** updateList.detail: ' + updateList);
+ FixtureUtil.withoutUpdate(updateList);
System.debug(LoggingLevel.INFO, '*** allsequenceList: ' + allsequenceList.size());
List<Rental_Apply_Sequence__c> oldSequenceList = [SELECT Id,ExternalKey__c,Fixture_Model_No__c FROM Rental_Apply_Sequence__c
@@ -1212,11 +1231,11 @@
List<Rental_Apply_Sequence__c> olddleteSequenceList = [SELECT Id,ExternalKey__c,Fixture_Model_No__c FROM Rental_Apply_Sequence__c
WHERE Apply_Set_Detail__c IN:changeddetailIds];
- delete olddleteSequenceList;
+ FixtureUtil.withoutDelete(olddleteSequenceList);
if(updateList.size() + count + oldSequenceList.size() + allsequenceList.size() > 9900){
throw new ControllerUtil.myException('褰撳墠鎺掗槦鏁版嵁閲忚繃澶э紝璇烽�夋嫨鍗曚釜涓讳綋鎿嶄綔');
}
- insert allsequenceList;
+ FixtureUtil.withoutInsert(allsequenceList);
List<String> newSequenceIds = new List<String>();
for(Rental_Apply_Sequence__c se:allsequenceList){
newSequenceIds.add(se.Id);
@@ -1265,7 +1284,7 @@
throw new ControllerUtil.myException('褰撳墠鎺掗槦鏁版嵁閲忚繃澶э紝璇烽�夋嫨鍗曚釜涓讳綋鎿嶄綔');
}
System.debug(LoggingLevel.INFO, '*** newSequenceList: ' + newSequenceList);
- upsert newSequenceList;
+ FixtureUtil.withoutUpsertObjects(newSequenceList);
}
@@ -1538,6 +1557,7 @@
return result;
}
+
public static List<String> transferStringToList(String str){
// System.debug(LoggingLevel.INFO, '*** str: ' + str);
List<String> strList = new List<String>();
@@ -1546,6 +1566,11 @@
}else{
strList.add(str);
}
+ for(Integer i = strList.size()-1;i >= 0 ; i --){
+ if(String.isEmpty(strList.get(i))){
+ strList.remove(i);
+ }
+ }
return strList;
}
--
Gitblit v1.9.1