From 68ec9682be0289965f7e1494a7f7082a64576048 Mon Sep 17 00:00:00 2001
From: zhangzhengmei <zhangzhengmei@prec-tech.com>
Date: 星期日, 06 八月 2023 18:17:25 +0800
Subject: [PATCH] 合同点检报告书页面调整及课题同步
---
force-app/main/default/classes/OFSInsReportLayoutForVmController.cls | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/OFSInsReportLayoutForVmController.cls b/force-app/main/default/classes/OFSInsReportLayoutForVmController.cls
index e6f561d..e61b985 100644
--- a/force-app/main/default/classes/OFSInsReportLayoutForVmController.cls
+++ b/force-app/main/default/classes/OFSInsReportLayoutForVmController.cls
@@ -358,6 +358,20 @@
}
List < Inspection_Report__c > queryIrs = [select Id, RecordType.DeveloperName, RecordType.Name, Name, Status__c, Inspection_StartTime__c, Inspection_EndTime__c, Contract__c,
+ //zzm 230727 add start
+ Department_Leakage_Frequency__c
+ ,Original_Leakage_Device__c
+ ,Leakage_Status__c
+ ,Disinfectant_type__c
+ ,Cleaning_Solution_Brand__c
+ ,Disinfection_Method__c
+ ,Escrow__c
+ ,Third_Party_Maintenance__c
+ ,CustomerSuggestion__c
+ ,Agency__c
+ ,Agency_Contact_Id__c,
+ //zzm 230727 add end
+
//add by rentx
Disinfectant__c, UsedMachine__c, SterilizationMethod__c, Used_ET__c, Others__c, CleaningFluid__c,Inspectup_Plan__c,Mode__c from Inspection_Report__c where Id = :pReportId];
if (queryIrs.size() <= 0) {
@@ -535,6 +549,7 @@
this.settingSoql = 'select Id, Name, Name_Manual__c, Next_StartHour_Page__c, Next_StartMinute_Page__c ';
this.settingSoql += ',Next_EndHour_Page__c, Next_EndMinute_Page__c,Disinfectant__c ,UsedMachine__c ,SterilizationMethod__c ,Used_ET__c, Mode__c ';
this.settingSoql += ',Others__c, Remarks__c, CleaningFluid__c ';
+ this.settingSoql += ',Department_Leakage_Frequency__c,Original_Leakage_Device__c,Leakage_Status__c,Disinfectant_type__c,Cleaning_Solution_Brand__c,Disinfection_Method__c,Escrow__c,Third_Party_Maintenance__c,CustomerSuggestion__c,Agency__c,Agency_Contact_Id__c ';
// 閲嶈銇爡鐩倰杩藉姞銇椼仾銇勩仧銈併伄銈汇儍銉�
Set < String > apiTempSet = new Set < String > ();
apiTempSet.add('Id');
@@ -545,6 +560,18 @@
apiTempSet.add('Next_EndHour_Page__c');
apiTempSet.add('Next_EndMinute_Page__c');
+ apiTempSet.add('Department_Leakage_Frequency__c');
+ apiTempSet.add('Original_Leakage_Device__c');
+ apiTempSet.add('Leakage_Status__c');
+ apiTempSet.add('Disinfectant_type__c');
+ apiTempSet.add('Cleaning_Solution_Brand__c');
+ apiTempSet.add('Disinfection_Method__c');
+ apiTempSet.add('Escrow__c');
+ apiTempSet.add('Third_Party_Maintenance__c');
+ apiTempSet.add('CustomerSuggestion__c');
+ apiTempSet.add('Agency__c');
+ apiTempSet.add('Agency_Contact_Id__c');
+
for (List < String > apiList: sectionApiList) {
for (String apiStr: apiList) {
if (String.isBlank(apiStr) == false && apiTempSet.contains(apiStr) == false) {
--
Gitblit v1.9.1