From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/classes/LexSummonsCreatController.cls | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/LexSummonsCreatController.cls b/force-app/main/default/classes/LexSummonsCreatController.cls
index f5fb177..598c217 100644
--- a/force-app/main/default/classes/LexSummonsCreatController.cls
+++ b/force-app/main/default/classes/LexSummonsCreatController.cls
@@ -349,6 +349,7 @@
for (AggregateResult orderdetail : orderdetailCount) {
zaikuId.add(String.valueOf(orderdetail.get('cpc')));
}
+ System.debug('orderdetailCount = ' + orderdetailCount);
System.debug('sqlagencyProType = ' + sqlagencyProType);
System.debug('userWorkLocation = ' + userWorkLocation);
System.debug('accountName = ' + accountName);
@@ -392,6 +393,7 @@
for (Integer i = 0; i < product2Selected.size(); i++) {
MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
}
+ System.debug('MidMap = ' + MidMap);
for (Integer i = 0; i < CountDel.size(); i++) {
String str = '';
if (CountDel[i].hospitalSpecialOffer__c) {
@@ -399,6 +401,8 @@
} else {
str = 'notHos';
}
+ System.debug('CountDel[i].Consumable_Product__c= ' + CountDel[i].Consumable_Product__c);
+ System.debug('CountDel[i].Consumable_Product__c + str= ' + CountDel[i].Consumable_Product__c + str);
//鏄庣粏2瀵瑰簲鐨勪骇鍝佸瓨鍦ㄤ簬MidMap涓�
if (MidMap.containsKey(CountDel[i].Consumable_Product__c)) {
//璁剧疆map涓璳ey鐨勫悗缂� 鐢ㄤ簬鍖哄垎鍖婚櫌鐗逛环鍜岄潪鍖婚櫌鐗逛环
@@ -1417,6 +1421,7 @@
WHERE Category3_text__c = :category3 AND Category4_text__c != NULL AND Category5_text__c != NULL
GROUP BY Category4_text__c
];
+ System.debug('category4List ' + category4List);
category4OptionList = new List<SelectOption>();
category4OptionList.add(new SelectOption('', '-鏃�-'));
category4OptionMap = new Map<String, String>();
@@ -1434,6 +1439,7 @@
GROUP BY Category5_text__c
];
+ System.debug('category5List ' + category5List);
category5OptionList = new List<SelectOption>();
category5OptionList.add(new SelectOption('', '-鏃�-'));
category5OptionMap = new Map<String, String>();
@@ -1465,6 +1471,7 @@
WHERE Category3_text__c = :category3 AND Category4_text__c != NULL AND Category5_text__c != NULL
GROUP BY Category4_text__c
];
+ System.debug('category4List ' + category4List);
category4OptionList = new List<SelectOption>();
category4OptionList.add(new SelectOption('', '-鏃�-'));
category4OptionMap = new Map<String, String>();
@@ -1482,6 +1489,7 @@
GROUP BY Category5_text__c
];
+ System.debug('category5List ' + category5List);
category5OptionList = new List<SelectOption>();
category5OptionList.add(new SelectOption('', '-鏃�-'));
category5OptionMap = new Map<String, String>();
@@ -1549,6 +1557,8 @@
AND Arrive_Owner_Work_Location__c = :userWorkLocationLwc
GROUP BY Consumable_Product__c, Box_Piece__c
];
+ System.debug('orderdetailCount = ' + orderdetailCount);
+
for (AggregateResult orderdetail : orderdetailCount) {
zaikuId.add(String.valueOf(orderdetail.get('cpc')));
}
@@ -2404,6 +2414,7 @@
InsAfterDel.Name = p.name + '-' + str;
InsAfterDel.Shipment_Count__c = ass.orderdetails1.Shipment_Count__c;
InsAfterDel.Consumable_order__c = ESetId;
+ System.debug('ass.Prod.id:' + ass.Prod.id);
InsAfterDel.Consumable_Product__c = ass.Prod.id;
InsAfterDel.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
InsAfterDel.Delivery_List_RMB__c = ass.orderdetails1.Delivery_List_RMB__c;
@@ -2674,11 +2685,30 @@
ResponseBodyLWC res = new ResponseBodyLWC();
Map<String, object> data = new Map<String, object>();
res.entity = data;
- List<ContentVersion> cvList = [
- SELECT id, Title, CreatedBy.Name, PathOnClient, CreatedDate, ContentDocumentId
- FROM ContentVersion
- WHERE FirstPublishLocationId = :recordId
- ];
+ List<ContentVersion> cvList = new List<ContentVersion>();
+ List<ContentDocumentLink> links = [SELECT Id, ContentDocumentId FROM ContentDocumentLink WHERE LinkedEntityId = :recordId];
+ if (links != null && links.size() > 0) {
+ List<String> documentIds = new List<String>();
+ for (ContentDocumentLink link : links) {
+ documentIds.add(link.ContentDocumentId);
+ }
+ List<ContentVersion> cvInfo = [
+ SELECT Id, Title, OwnerId, Owner.Name, CreatedDate, ContentDocumentId
+ FROM ContentVersion
+ WHERE ContentDocumentId IN :documentIds
+ ];
+
+ if (cvInfo.size() > 0) {
+ for (Integer i = 0; i < cvInfo.size(); i++) {
+ cvList.add(cvInfo[i]);
+ }
+ }
+ }
+ // List<ContentVersion> cvList = [
+ // SELECT id, Title, CreatedBy.Name, PathOnClient, CreatedDate, ContentDocumentId
+ // FROM ContentVersion
+ // WHERE FirstPublishLocationId = :recordId
+ // ];
data.put('cvList', cvList);
res.status = 'Success';
res.code = 200;
@@ -2865,6 +2895,7 @@
}
//闄勪欢
+ @TestVisible
public ConsumableorderdetailsInfo(Attachment e) {
concc = e;
hospitalSpecialOffer = false;
@@ -2915,7 +2946,6 @@
}
}
}
-
@TestVisible
class ConsumableorderdetailsInfoLwc {
@AuraEnabled
@@ -2994,4 +3024,4 @@
@AuraEnabled
public Integer recordEnd { get; set; }
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1