From fd9df05c48c09b4d7f39a3b401882bda226dedea Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 31 十月 2023 20:38:18 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/classes/MaintenanceProductDataController.cls | 67 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/MaintenanceProductDataController.cls b/force-app/main/default/classes/MaintenanceProductDataController.cls
index 0483fd3..a1bad1c 100644
--- a/force-app/main/default/classes/MaintenanceProductDataController.cls
+++ b/force-app/main/default/classes/MaintenanceProductDataController.cls
@@ -68,7 +68,9 @@
//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 ];
+ // 20231103 闄堜含姝� sitbug瀵瑰簲 Start
+ 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 ];
+ // 20231103 闄堜含姝� sitbug瀵瑰簲 End
}
}
//LJPH-C6A3DF 銆愬鎵樸�� 銆愰噸瑕併�戜骇鍝佷富鏁版嵁涓鍔犳湇鍔＄敤浜у搧鍒嗙被 liuyan 20210908 End
@@ -83,7 +85,9 @@
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>();
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 Start
+ private List<ContentDocument> attachmentinfo = new List<ContentDocument>();
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 End
//-----------
private void initStandardController(){
@@ -474,8 +478,18 @@
mpdPrice.mpded.Intra_Trade_Service_RMB_Old__c = null;
}
}
- //闄勪欢
- attachmentinfo =[SELECT Id, Name,OwnerId FROM Attachment WHERE parentid =:id ];
+ //闄勪欢(lightning)
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 Start
+ 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 ];
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 End
if(attachmentinfo.size()>0){
for (Integer i = 0; i < attachmentinfo.size(); i++) {
attachmentRecoeds.add(new MaintenanceProductDataDetailsInfo(attachmentinfo[i]));
@@ -533,7 +547,29 @@
// 鏄剧ず鏁版嵁鏉℃暟淇℃伅
makeMessage();
}
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 Start
+ public void refreshFile(){
+ if(String.isBlank(id)){
+ return;
+ }
+ attachmentRecoeds = new List<MaintenanceProductDataDetailsInfo>();
+ 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]));
+ }
+ }
+ }
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 End
public PageReference save() {
Integer FLG = 0;
Integer Count = 0;
@@ -1086,11 +1122,21 @@
return ref;
}
//涓婁紶闄勪欢
+ // 20231103 闄堜含姝� Lightning鏂囦欢淇敼 Start
public PageReference FilesUpload(){
PageReference ref = new Pagereference('/p/attach/NoteAttach?pid='+id+'&retURL=%2F' + '/apex/MaintenanceProductData?id=' +id);
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;
+ }
+ // 20231103 闄堜含姝� Lightning鏂囦欢淇敼 Start
// 鎻愪氦鎸夐挳
public PageReference Submitmpd() {
//List<Maintenance_Product_Data__c> qs = New List<Maintenance_Product_Data__c>();
@@ -1176,7 +1222,10 @@
public PageReference returnMpdPage(){
PageReference ref;
if(String.isBlank(id)){
- ref = new Pagereference(ApexPages.currentPage().getParameters().get('retURL'));
+ // 20231103 闄堜含姝� Lightning鏂囦欢淇敼 Start
+ // ref = new Pagereference(ApexPages.currentPage().getParameters().get('retURL'));
+ ref = new Pagereference('/lightning/o/Maintenance_Product_Data__c/list?filterName=Recent');
+ // 20231103 闄堜含姝� Lightning鏂囦欢淇敼 End
}else{
ref = new Pagereference('/'+id);
}
@@ -1351,7 +1400,9 @@
public Boolean canSelect { get; set; }
public Product2 Prod { get; set; }
public Maintenance_Product_Data_Details__c mpdrdd {get; set;}
- public Attachment Concc { get; set; }
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 Start
+ public ContentDocument Concc { get; set; }
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 End
public MaintenanceProductDataDetailsInfo(Maintenance_Product_Data_Details__c e) {
check = true;
@@ -1368,9 +1419,11 @@
canSelect = true;
}
//闄勪欢
- public MaintenanceProductDataDetailsInfo(Attachment e) {
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 Start
+ public MaintenanceProductDataDetailsInfo(ContentDocument e) {
Concc = e;
}
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 End
}
class MpdDetailsInfo {
public Boolean check { get; set; }
--
Gitblit v1.9.1