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/UpdateRentalApplyEquipmentSetBatch.cls | 317 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 315 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/UpdateRentalApplyEquipmentSetBatch.cls b/force-app/main/default/classes/UpdateRentalApplyEquipmentSetBatch.cls
index 5e69396..9b31470 100644
--- a/force-app/main/default/classes/UpdateRentalApplyEquipmentSetBatch.cls
+++ b/force-app/main/default/classes/UpdateRentalApplyEquipmentSetBatch.cls
@@ -93,6 +93,246 @@
i ++;
i ++;
i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
+ i ++;
}
/**
@@ -265,8 +505,15 @@
for(AggregateResult point : points){
pointMap.put(String.valueOf(point.get('userId')), Integer.valueOf(point.get('fp')));
}
-
- List<User> users = [select Id, Foul_Points__c from User where Id != '005100000016ykkAAA' AND Id != '00510000007iWvrAAE' AND Id != '0051000000D9fP3AAJ'];
+ /* 20220615 ljh Id != 瑙ｅ喅
+ ** 閭欢鎶ラ敊 User:鐢ㄦ埛:INSUFFICIENT_ACCESS_OR_READONLY:():SalesforceIQIntegration User cannot be edited
+ */
+ List<User> users = [select Id, Foul_Points__c from User where Id != '005100000016ykkAAA'
+ AND Id != '00510000007iWvrAAE'
+ AND Id != '0051000000D9fP3AAJ'
+ AND Id != '0051000000DZdlJAAT'
+ AND Id != '0051000000DbxVkAAJ'
+ ];
List<User> updList = new List<User>();
for (User usr : users) {
if (usr.Foul_Points__c <> 0 || pointMap.containsKey(usr.id) == true) {
@@ -333,6 +580,29 @@
+ ', Extend_Date_F__c'
+ ', Received_NG_ReAssign_Text__c'
+ ', Received_NG_ReAssign__c'
+ //銆怓Y23澶у強宸ㄥぇ璇鹃銆戦暱鍋囧鍝佸�熺敤寤舵湡寮�鍙� 2022/12/27 start xxf
+ + ', Final_reply_day_Holiday_backup__c'
+ + ', NG_Final_reply_day_F_Holiday_backup__c'
+ + ', NG_Final_reply_day_Text_Holiday_backup__c'
+ + ', Yizhouweixiu_Final_reply_day_F_Holiday__c'
+ + ', Yizhouweixiu_Final_reply_day_TextHoliday__c'
+ + ', Extend_Final_reply_day_F_Holiday_backup__c'
+ + ', Extend_Final_reply_day_Text_Holiday_back__c'
+ + ', QIS_Final_reply_day_F_Holiday_backup__c'
+ + ', QIS_Final_reply_day_Text_Holiday_backup__c'
+ + ', Repair_cancel_Final_reply_day_F_Holiday__c'
+ + ', Repair_cancel_Final_reply_day_Text_Holid__c'
+ + ', Return_to_office_Final_reply_day_F_Ho__c'
+ + ', Return_to_office_Final_reply_day_Text_Ho__c'
+ + ', Repair_delete_Final_reply_day_F_Holiday__c'
+ + ', Repair_delete_Final_reply_day_Text_Ho__c'
+ + ', Yigoudaihuo_Final_reply_day_F_Holiday__c'
+ + ', Yigoudaihuo_Final_reply_day_Text_Holiday__c'
+ + ', FGuzhangpaicha_Final_reply_day_F_Holiday__c'
+ + ', Guzhangpaicha_Final_reply_day_Text_Holid__c'
+ + ', Return_to_office_Final_reply_day_U_RC_Ho__c'
+ + ', Return_to_office_Final_reply_day_U_RC_FH__c'
+ //銆怓Y23澶у強宸ㄥぇ璇鹃銆戦暱鍋囧鍝佸�熺敤寤舵湡寮�鍙� 2022/12/27 end xxf
+' FROM Rental_Apply_Equipment_Set__c'
+' WHERE ' + (idSet == null ? '' : 'Id = :idSet AND (')
+ '('
@@ -416,11 +686,15 @@
// 瀛楁Return_to_office_Final_reply_day_F__c鏈変娇鐢≧eturn_to_office_Final_reply_day_U_RC__c瀛楁
if (equalNullCheck(obj.Return_to_office_Final_reply_day_U_RC__c, obj.Return_to_office_Final_reply_day_U_RC_F__c) || obj.Return_to_office_Final_reply_day_U_RC__c != obj.Return_to_office_Final_reply_day_U_RC_F__c) {
raes.Return_to_office_Final_reply_day_U_RC__c = obj.Return_to_office_Final_reply_day_U_RC_F__c;
+ //銆怓Y23澶у強宸ㄥぇ璇鹃銆戦暱鍋囧鍝佸�熺敤寤舵湡寮�鍙� 2022/12/27 start xxf
+ raes.Return_to_office_Final_reply_day_U_RC_Ho__c = obj.Return_to_office_Final_reply_day_U_RC_FH__c;
+ //銆怓Y23澶у強宸ㄥぇ璇鹃銆戦暱鍋囧鍝佸�熺敤寤舵湡寮�鍙� 2022/12/27 end xxf
hasChange = true;
if (raesIdSet != null) {
raesIdSet.add(raes.Id);
}
}
+
/************************************ 绗竴娆℃洿鏂板瓧娈碉紙闇�瑕佺浜屾鏇存柊鐨勫瓧娈碉級 End ******************************************/
/************************************ 绗簩娆℃洿鏂板瓧娈� OR 鍙洿鏂颁竴娆″氨鍙互鐨勫瓧娈� Start ******************************************/
@@ -498,6 +772,45 @@
/************************************ 绗簩娆℃洿鏂板瓧娈� OR 鍙洿鏂颁竴娆″氨鍙互鐨勫瓧娈� End ******************************************/
+ //銆怓Y23澶у強宸ㄥぇ璇鹃銆戦暱鍋囧鍝佸�熺敤寤舵湡寮�鍙� 2022/12/27 start xxf
+ if (equalNullCheck(obj.QIS_Final_reply_day_Text_Holiday_backup__c, obj.QIS_Final_reply_day_F_Holiday_backup__c) || obj.QIS_Final_reply_day_Text_Holiday_backup__c != obj.QIS_Final_reply_day_F_Holiday_backup__c) {
+ raes.QIS_Final_reply_day_Text_Holiday_backup__c = obj.QIS_Final_reply_day_F_Holiday_backup__c;
+ hasChange = true;
+ }
+ if (equalNullCheck(obj.Yizhouweixiu_Final_reply_day_TextHoliday__c, obj.Yizhouweixiu_Final_reply_day_F_Holiday__c) || obj.Yizhouweixiu_Final_reply_day_TextHoliday__c != obj.Yizhouweixiu_Final_reply_day_F_Holiday__c) {
+ raes.Yizhouweixiu_Final_reply_day_TextHoliday__c = obj.Yizhouweixiu_Final_reply_day_F_Holiday__c;
+ hasChange = true;
+ }
+ if (equalNullCheck(obj.Extend_Final_reply_day_Text_Holiday_back__c, obj.Extend_Final_reply_day_F_Holiday_backup__c) || obj.Extend_Final_reply_day_Text_Holiday_back__c != obj.Extend_Final_reply_day_F_Holiday_backup__c) {
+ raes.Extend_Final_reply_day_Text_Holiday_back__c = obj.Extend_Final_reply_day_F_Holiday_backup__c;
+ hasChange = true;
+ }
+ if (equalNullCheck(obj.NG_Final_reply_day_Text_Holiday_backup__c, obj.NG_Final_reply_day_F_Holiday_backup__c) || obj.NG_Final_reply_day_Text_Holiday_backup__c != obj.NG_Final_reply_day_F_Holiday_backup__c) {
+ raes.NG_Final_reply_day_Text_Holiday_backup__c = obj.NG_Final_reply_day_F_Holiday_backup__c;
+ hasChange = true;
+ }
+ if (equalNullCheck(obj.Repair_cancel_Final_reply_day_Text_Holid__c, obj.Repair_cancel_Final_reply_day_F_Holiday__c) || obj.Repair_cancel_Final_reply_day_Text_Holid__c != obj.Repair_cancel_Final_reply_day_F_Holiday__c) {
+ raes.Repair_cancel_Final_reply_day_Text_Holid__c = obj.Repair_cancel_Final_reply_day_F_Holiday__c;
+ hasChange = true;
+ }
+ if (equalNullCheck(obj.Return_to_office_Final_reply_day_Text_Ho__c, obj.Return_to_office_Final_reply_day_F_Ho__c) || obj.Return_to_office_Final_reply_day_Text_Ho__c != obj.Return_to_office_Final_reply_day_F_Ho__c) {
+ raes.Return_to_office_Final_reply_day_Text_Ho__c = obj.Return_to_office_Final_reply_day_F_Ho__c;
+ hasChange = true;
+ }
+ if (equalNullCheck(obj.Repair_delete_Final_reply_day_Text_Ho__c, obj.Repair_delete_Final_reply_day_F_Holiday__c) || obj.Repair_delete_Final_reply_day_Text_Ho__c != obj.Repair_delete_Final_reply_day_F_Holiday__c) {
+ raes.Repair_delete_Final_reply_day_Text_Ho__c = obj.Repair_delete_Final_reply_day_F_Holiday__c;
+ hasChange = true;
+ }
+ if (equalNullCheck(obj.Yigoudaihuo_Final_reply_day_Text_Holiday__c, obj.Yigoudaihuo_Final_reply_day_F_Holiday__c) || obj.Yigoudaihuo_Final_reply_day_Text_Holiday__c != obj.Yigoudaihuo_Final_reply_day_F_Holiday__c) {
+ raes.Yigoudaihuo_Final_reply_day_Text_Holiday__c = obj.Yigoudaihuo_Final_reply_day_F_Holiday__c;
+ hasChange = true;
+ }
+ if (equalNullCheck(obj.Guzhangpaicha_Final_reply_day_Text_Holid__c, obj.FGuzhangpaicha_Final_reply_day_F_Holiday__c) || obj.Guzhangpaicha_Final_reply_day_Text_Holid__c != obj.FGuzhangpaicha_Final_reply_day_F_Holiday__c) {
+ raes.Guzhangpaicha_Final_reply_day_Text_Holid__c = obj.FGuzhangpaicha_Final_reply_day_F_Holiday__c;
+ hasChange = true;
+ }
+ //銆怓Y23澶у強宸ㄥぇ璇鹃銆戦暱鍋囧鍝佸�熺敤寤舵湡寮�鍙� 2022/12/27 end xxf
+
if (hasChange) {
return raes;
} else {
--
Gitblit v1.9.1