gzw 测试环境代码更新

高章伟

2023-03-03 d8dc84a3d56df839895f1c417a4d9cbee763d262

 force-app/main/default/classes/RentalApplyEquipmentSetHandler.cls

@@ -157,6 +157,9 @@
        formulaToTextCheck();
        for (Rental_Apply_Equipment_Set__c nObj : newList) {
            if (nObj.Min_Final_reply_day_Text__c != nObj.Min_Final_reply_day_F__c
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 start xxf
                    || nObj.Min_Final_reply_day_Text_Holiday_backup__c != nObj.Min_Final_reply_day_F_Holiday_backup__c
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 end xxf
                    || nObj.Received_Confirm_Status_Text__c != nObj.Received_Confirm_Status_F__c) {
                raesIdSet.add(nObj.Id);
            }
@@ -187,6 +190,9 @@
            }

            if (nObj.Min_Final_reply_day_Text__c != nObj.Min_Final_reply_day_F__c
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 start xxf
                    || nObj.Min_Final_reply_day_Text_Holiday_backup__c != nObj.Min_Final_reply_day_F_Holiday_backup__c
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 end xxf
                    || nObj.Received_Confirm_Status_Text__c != nObj.Received_Confirm_Status_F__c) {
                raesIdSet.add(nObj.Id);
            }
@@ -213,14 +219,24 @@
                    , Min_Final_reply_day_F__c
                    ,  Received_Confirm_Status_Text__c
                    ,  Received_Confirm_Status_F__c
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 start xxf
                    ,  Min_Final_reply_day_Text_Holiday_backup__c
                    ,  Min_Final_reply_day_F_Holiday_backup__c
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 end xxf
                 FROM Rental_Apply_Equipment_Set__c
                WHERE Id = :raesdIdSet];
        List<Rental_Apply_Equipment_Set__c> updateRaesList = new List<Rental_Apply_Equipment_Set__c>();
        for (Rental_Apply_Equipment_Set__c raes : raesList) {
            if (raes.Min_Final_reply_day_Text__c != raes.Min_Final_reply_day_F__c
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 start xxf
                    || raes.Min_Final_reply_day_Text_Holiday_backup__c != raes.Min_Final_reply_day_F_Holiday_backup__c
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 end xxf
                    || raes.Received_Confirm_Status_Text__c != raes.Received_Confirm_Status_F__c) {
                raes.Min_Final_reply_day_Text__c = raes.Min_Final_reply_day_F__c;
                raes.Received_Confirm_Status_Text__c = raes.Received_Confirm_Status_F__c;
                //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 start xxf
                raes.Min_Final_reply_day_Text_Holiday_backup__c = raes.Min_Final_reply_day_F_Holiday_backup__c;
                //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 end xxf
                updateRaesList.add(raes);
            }
        }
@@ -499,6 +515,19 @@
            nObj.Repair_Agreed_Quotation_Text__c = nObj.Repair_Agreed_Quotation_F__c;
            nObj.Return_to_office_Final_reply_day_U_RC__c = nObj.Return_to_office_Final_reply_day_U_RC_F__c;
            nObj.Extend_Date__c = nObj.Extend_Date_F__c;
            //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 start xxf
            nObj.NG_Final_reply_day_Text_Holiday_backup__c = nObj.NG_Final_reply_day_F_Holiday_backup__c;
            nObj.Yizhouweixiu_Final_reply_day_TextHoliday__c = nObj.Yizhouweixiu_Final_reply_day_F_Holiday__c;
            nObj.Extend_Final_reply_day_Text_Holiday_back__c = nObj.Extend_Final_reply_day_F_Holiday_backup__c;
            nObj.QIS_Final_reply_day_Text_Holiday_backup__c = nObj.QIS_Final_reply_day_F_Holiday_backup__c;
            nObj.Repair_cancel_Final_reply_day_Text_Holid__c = nObj.Repair_cancel_Final_reply_day_F_Holiday__c;
            nObj.Return_to_office_Final_reply_day_Text_Ho__c = nObj.Return_to_office_Final_reply_day_F_Ho__c;
            nObj.Repair_delete_Final_reply_day_Text_Ho__c = nObj.Repair_delete_Final_reply_day_F_Holiday__c;
            nObj.Yigoudaihuo_Final_reply_day_Text_Holiday__c = nObj.Yigoudaihuo_Final_reply_day_F_Holiday__c;
            nObj.Guzhangpaicha_Final_reply_day_Text_Holid__c = nObj.FGuzhangpaicha_Final_reply_day_F_Holiday__c;
            nObj.Return_to_office_Final_reply_day_U_RC_Ho__c = nObj.Return_to_office_Final_reply_day_U_RC_FH__c;
            nObj.Min_Final_reply_day_Text_Holiday_backup__c = nObj.Min_Final_reply_day_F_Holiday_backup__c;
            //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 end xxf
            /*
               Min_Final_reply_day_F__c =
               MIN(
@@ -737,6 +766,9 @@
            
            if (nObj.Received_Confirm_Status_Text__c != nObj.Received_Confirm_Status_F__c
                  || nObj.Min_Final_reply_day_Text__c != nObj.Min_Final_reply_day_F__c
                  //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 start xxf
                    || nObj.Min_Final_reply_day_Text_Holiday_backup__c != nObj.Min_Final_reply_day_F_Holiday_backup__c
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 end xxf
                  || ((String.isNotBlank(nObj.Old_Rental_Apply_F__c) && String.isNotBlank(nObj.Old_Rental_Apply__c) && nObj.Old_Rental_Apply_F__c != nObj.Old_Rental_Apply__c)
                    || (String.isNotBlank(nObj.Old_Rental_Apply_F__c) && String.isBlank(nObj.Old_Rental_Apply__c))
                    || (String.isBlank(nObj.Old_Rental_Apply_F__c) && String.isNotBlank(nObj.Old_Rental_Apply__c))
@@ -755,9 +787,15 @@
                    raes.Old_Rental_Apply__c = nObj.Old_Rental_Apply_F__c; // 20210816 XHL add
                }
                if (nObj.Received_Confirm_Status_Text__c != nObj.Received_Confirm_Status_F__c
                  || nObj.Min_Final_reply_day_Text__c != nObj.Min_Final_reply_day_F__c){
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 start xxf
                    || nObj.Min_Final_reply_day_Text_Holiday_backup__c != nObj.Min_Final_reply_day_F_Holiday_backup__c
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 end xxf
                    || nObj.Min_Final_reply_day_Text__c != nObj.Min_Final_reply_day_F__c){
                    raes.Received_Confirm_Status_Text__c = nObj.Received_Confirm_Status_F__c;
                    raes.Min_Final_reply_day_Text__c = nObj.Min_Final_reply_day_F__c;
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 start xxf
                    raes.Min_Final_reply_day_Text_Holiday_backup__c = nObj.Min_Final_reply_day_F_Holiday_backup__c;
                    //【FY23大及巨大课题】长假备品借用延期开发 2022/12/27 end xxf
                }
                // 20210817 XHL update end
                raess.add(raes);