From 988f9735377909b6310301e582c15804e004783f Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期六, 07 十月 2023 10:36:13 +0800
Subject: [PATCH] 近期修改cjw
---
force-app/main/default/classes/MaintenanceProductDataController.cls | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/MaintenanceProductDataController.cls b/force-app/main/default/classes/MaintenanceProductDataController.cls
index 0483fd3..7136229 100644
--- a/force-app/main/default/classes/MaintenanceProductDataController.cls
+++ b/force-app/main/default/classes/MaintenanceProductDataController.cls
@@ -68,7 +68,7 @@
//LJPH-C6A3DF 銆愬鎵樸�� 銆愰噸瑕併�戜骇鍝佷富鏁版嵁涓鍔犳湇鍔＄敤浜у搧鍒嗙被 liuyan 20210908 Star
public List<Maintenance_Product_Data_Details__c> RepairInfo {
get {
- return [select id,Service_Category6__c,Service_Category7__c FROM Maintenance_Product_Data_Details__c where Default_Fixture_Arrival_Product__c = '' LIMIT 1 ];
+ return [select id,Service_Category6__c,Service_Category7__c FROM Maintenance_Product_Data_Details__c where Default_Fixture_Arrival_Product__c = '' and Service_Category6__c = null and Service_Category7__c = null LIMIT 1 ];
}
}
//LJPH-C6A3DF 銆愬鎵樸�� 銆愰噸瑕併�戜骇鍝佷富鏁版嵁涓鍔犳湇鍔＄敤浜у搧鍒嗙被 liuyan 20210908 End
@@ -83,7 +83,7 @@
public Boolean editDelCommitBtnDisabled {get; private set;}
public Boolean saveBtnDisabled { get; private set; }
//public Boolean sorderBtnDisabled { get; private set; }
- private List<Attachment> attachmentinfo = new List<Attachment>();
+ private List<ContentDocument> attachmentinfo = new List<ContentDocument>();
//-----------
private void initStandardController(){
@@ -474,8 +474,17 @@
mpdPrice.mpded.Intra_Trade_Service_RMB_Old__c = null;
}
}
- //闄勪欢
- attachmentinfo =[SELECT Id, Name,OwnerId FROM Attachment WHERE parentid =:id ];
+ //闄勪欢(lightning)
+ List<ContentDocumentLink> cdlList = [SELECT ContentDocumentId
+ FROM ContentDocumentLink
+ WHERE LinkedEntityId = :id];
+ List<ID> fileIDs = new List<ID>();
+ for (ContentDocumentLink docLink : cdlList) {
+ fileIDs.add(docLink.ContentDocumentId);
+ }
+ attachmentinfo=[SELECT Title,OwnerId,ContentModifiedDate from ContentDocument WHERE id IN :fileIDs];
+
+ // attachmentinfo =[SELECT Id, Name,OwnerId FROM Attachment WHERE parentid =:id ];
if(attachmentinfo.size()>0){
for (Integer i = 0; i < attachmentinfo.size(); i++) {
attachmentRecoeds.add(new MaintenanceProductDataDetailsInfo(attachmentinfo[i]));
@@ -1091,6 +1100,14 @@
ref.setRedirect(true);
return ref;
}
+ public PageReference FilesUploadLightning(){
+ // PageReference ref = new Pagereference('/p/attach/NoteAttach?pid='+id+'&retURL=%2F' + '/apex/MaintenanceProductData?id=' +id);
+ // ref.setRedirect(true);
+ // return ref;
+ PageReference ref = new Pagereference('/lightning/n/LexUploadPage?0.recordId='+id+'');
+ ref.setRedirect(true);
+ return ref;
+ }
// 鎻愪氦鎸夐挳
public PageReference Submitmpd() {
//List<Maintenance_Product_Data__c> qs = New List<Maintenance_Product_Data__c>();
@@ -1176,7 +1193,8 @@
public PageReference returnMpdPage(){
PageReference ref;
if(String.isBlank(id)){
- ref = new Pagereference(ApexPages.currentPage().getParameters().get('retURL'));
+ // ref = new Pagereference(ApexPages.currentPage().getParameters().get('retURL'));
+ ref = new Pagereference('/lightning/o/Maintenance_Product_Data__c/list?filterName=Recent');
}else{
ref = new Pagereference('/'+id);
}
@@ -1351,7 +1369,7 @@
public Boolean canSelect { get; set; }
public Product2 Prod { get; set; }
public Maintenance_Product_Data_Details__c mpdrdd {get; set;}
- public Attachment Concc { get; set; }
+ public ContentDocument Concc { get; set; }
public MaintenanceProductDataDetailsInfo(Maintenance_Product_Data_Details__c e) {
check = true;
@@ -1368,7 +1386,7 @@
canSelect = true;
}
//闄勪欢
- public MaintenanceProductDataDetailsInfo(Attachment e) {
+ public MaintenanceProductDataDetailsInfo(ContentDocument e) {
Concc = e;
}
}
--
Gitblit v1.9.1