From 8475b9f98c8a4c95446f02be4bf2a64e359c359a Mon Sep 17 00:00:00 2001
From: liwentao <1376563863@qq.com>
Date: 星期五, 11 八月 2023 09:10:31 +0800
Subject: [PATCH] 与测试环境对比，部分代码已被人修改，删除其中的alert和部分硬编码，还原测试环境代码逻辑
---
force-app/main/default/classes/AssetModifyBelongsController.cls | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/AssetModifyBelongsController.cls b/force-app/main/default/classes/AssetModifyBelongsController.cls
index c9ca4ce..8b89bb5 100644
--- a/force-app/main/default/classes/AssetModifyBelongsController.cls
+++ b/force-app/main/default/classes/AssetModifyBelongsController.cls
@@ -50,7 +50,7 @@
public Boolean isShow { get; set; }
public List<Attachment> attachments { get; set; }
//CHAN-BC6BV2 XHL AddEnd 20190522
-
+ public List<ContentDocument> contents { get; set; }
//鍒嗛〉鍔熻兘
public Integer pageLimit {get; set;}
public String soql {get; set;}
@@ -68,6 +68,16 @@
pageLimit = Integer.valueOf(System.Label.orderdetPageLimitsize);
attachments = new List<Attachment>();
+ //update 鏉庢枃娑� 2023/07/13 鏇存柊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);
+ }
+ contents=[SELECT Title,OwnerId,ContentModifiedDate from ContentDocument WHERE id IN :fileIDs];
+ //update 鏉庢枃娑� 2023/07/13 鏇存柊lightning闄勪欢涓婁紶 end
}
public boolean getcheckUser() {
@@ -170,7 +180,8 @@
Map<String, AssetModifyBelongsChangeDetailInfo> MidMap = new Map<String, AssetModifyBelongsChangeDetailInfo>();
List<Asset> asListed = new List<Asset>();
soql = this.makeSoql1(text1, val1);
- asListed = Database.query(soql);
+ System.debug('soql:'+soql);
+ asListed = Database.query(soql);
asListed = noSubmittedList(asListed);
for (AssetModifyBelongsChangeDetailInfo bss : assetModifyBelongsChangeDetailRecordsview) {
if (bss.check == true) {
@@ -260,7 +271,19 @@
if (String.isNotBlank(val1)) {
val1 = val1.trim();
}
- String soql = 'select Id,name,SerialNumber,Asset_situation__c,Order_No__c,Account.Name,Status,Installation_Site__c,CurrentContract__c from Asset where AccountId = \'' + RawAccountId + '\'';
+ String soql='';
+ //update by liwentao 20230705 start
+ System.debug(RawAccountId);
+ RawAccountId='';
+ if(String.isBlank(RawAccountId)){
+ soql = 'select Id,name,SerialNumber,Asset_situation__c,Order_No__c,Account.Name,Status,Installation_Site__c,CurrentContract__c from Asset where AccountId = \'\'';
+ System.debug('id is null');
+ }
+ else {
+ soql = 'select Id,name,SerialNumber,Asset_situation__c,Order_No__c,Account.Name,Status,Installation_Site__c,CurrentContract__c from Asset where AccountId = \'' + RawAccountId + '\'';
+ System.debug('id is not null');
+ }
+ //update by liwentao 20230705 start
if (!String.isBlank(text1)) {
if (text1 == 'Order_No__c' && checkexact) {
soql += ' AND (' + text1 + ' = \'' + String.escapeSingleQuotes(val1) + '\' )';
@@ -325,9 +348,20 @@
//璺宠浆鍒颁笂浼犻檮浠堕〉闈�
public PageReference uploadingAttachment() {
PageReference ref = new Pagereference('/p/attach/NoteAttach?pid=' + Id + '&retURL=%2Fapex/AssetModifyBelongs?Id=' + Id);
+
ref.setRedirect(true);
return ref;
}
+ //update 鏉庢枃娑� 2023/07/13 鏇存柊lightning闄勪欢涓婁紶 start
+ //璺宠浆鍒颁笂浼犻檮浠堕〉闈紙lightning锛�
+ public PageReference uploadingAttachmentLightning() {
+ //PageReference ref = new Pagereference('/p/attach/NoteAttach?pid=' + Id + '&retURL=%2Fapex/AssetModifyBelongs?Id=' + Id);
+ PageReference ref = new Pagereference('/lightning/n/lightning?backgroundContext=%2Flightning%2Fr%2FAssetModifyBelongsChange__c%2F'+Id+'%2Fedit%3Fcount%3D1&0.recordId='+Id+'');
+
+ ref.setRedirect(true);
+ return ref;
+ }
+ //update 鏉庢枃娑� 2023/07/13 鏇存柊lightning闄勪欢涓婁紶 end
// CHAN-BC6BV2 XHL AddEnd 20190522
// 閲嶆柊鍒锋柊
public PageReference returnChangePage() {
--
Gitblit v1.9.1