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/ConsumTrialController.cls | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/ConsumTrialController.cls b/force-app/main/default/classes/ConsumTrialController.cls
index 04fa687..a6714fc 100644
--- a/force-app/main/default/classes/ConsumTrialController.cls
+++ b/force-app/main/default/classes/ConsumTrialController.cls
@@ -17,6 +17,7 @@
private String saveType{get;set;}
public String staticResource {get; set;}
public String rowListString{set;get;}
+ public String EditAWSDataId{set;get;}
public ConsumTrialController(ApexPages.StandardController stdController) {
parId = System.currentPageReference().getParameters().get('Id');
@@ -216,10 +217,13 @@
else if (rnList[0].Status__c == '鍙栨秷') {
throw new ControllerUtil.myException('鍙栨秷鐨勮�楁潗鐢宠涔︿笉鑳戒繚瀛�');
}
+ system.debug('鑰楁潗澶囧搧鏄庣粏鍔犲瘑淇℃伅:'+JSON.serialize(pageB.rowBList));
List<Consum_Apply_Equipment_Set_Detail__c> rndList = new List<Consum_Apply_Equipment_Set_Detail__c>();
for (RowBean rowB : pageB.rowBList) {
if (rowB.checked) {
rowB.rnd.InputCheck__c = true;
+ //rowB.rnd.AWS_Data_Id__c = EditAWSDataId;
+ System.debug('zhj rowB.rnd.AWS_Data_Id__c = '+ rowB.rnd.AWS_Data_Id__c);
rndList.add(rowB.rnd);
}
}
@@ -227,7 +231,7 @@
FixtureUtil.withoutUpdate(rndList, true);
PageReference pag = new PageReference('/apex/ConsumTrial?id=' + parId + '&canedit=true&saveType=1');
pag.setRedirect(true);
- return pag;
+ return null;
}
else{
init();
@@ -414,7 +418,7 @@
+ String.join(assetFieldApiList, ',')
+ (assetFieldApiList.size() > 0 ? ',' : '')
+ String.join(receivingNoteFieldApiList, ',')
- + ',AWS_Data_Id__c'
+ + ',AWS_Data_Id__c' //zhj 鏂版柟妗堟敼閫� 2022-12-30 鍒犻櫎Trial_User_Encrypt__c
+ ' FROM Consum_Apply_Equipment_Set_Detail__c '
+ ' WHERE Consum_Apply_Equipment_Set__r.Consum_Apply__c = \'' + rn.Id + '\'' + wher
+ ' AND (Cancel_Select__c = false OR NG_Select_Again__c = true)'
@@ -484,7 +488,7 @@
// dataConfirmation = rnd1.DataConfirmation__c;
lineNo = lineNo1 + 1;
canChangeField = 'Show_demonstration__c, Operation_Type__c, Consum_Start_Date__c';
- canChangeField += ',AWS_Data_Id__c, Case_OR_animal_organ__c, Trial_User__c, Follower_User__c, Spare__c, Comment__c, Degree_Of_Importance__c';
+ canChangeField += ',AWS_Data_Id__c, Case_OR_animal_organ__c, Trial_User__c, Follower_User__c, Spare__c, Comment__c, Degree_Of_Importance__c'; //zhj 鏂版柟妗堟敼閫� 2022-12-30 鍒犻櫎Trial_User_Encrypt__c
haveAsset = String.isNotBlank(rnd1.Asset__c);
}
@@ -565,5 +569,62 @@
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++;
}
}
\ No newline at end of file
--
Gitblit v1.9.1