From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/classes/Batch_FixAttachmentToFiles.cls | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 83 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls b/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls
index 1d917ed..b94c2ba 100644
--- a/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls
+++ b/force-app/main/default/classes/Batch_FixAttachmentToFiles.cls
@@ -1,9 +1,18 @@
+<<<<<<< HEAD
global without sharing class Batch_FixAttachmentToFiles implements Database.Batchable<sObject> {
// Id batchJobId = Database.executeBatch(new Batch_FixAttachmentToFiles('Consumable_order__c',Datetime.newInstance(2023, 1, 1, 8, 0, 0),Datetime.newInstance(2024, 1, 1, 8, 0, 0)),2000);
private Datetime creStartDate = null;
private Datetime creEndDate = null;
private String objectApiName = null;
private Set<String> parentIds = new Set<String>(); //Add by Li Jun 20230703
+=======
+global without sharing class Batch_FixAttachmentToFiles implements Database.Batchable<sObject>{
+ // Id batchJobId = Database.executeBatch(new Batch_FixAttachmentToFiles('Consumable_order__c',Datetime.newInstance(2023, 1, 1, 8, 0, 0),Datetime.newInstance(2024, 1, 1, 8, 0, 0)),2000);
+ private Datetime creStartDate = null;
+ private Datetime creEndDate = null;
+ private String objectApiName = null;
+ private Set<String> parentIds = new Set<String>();//Add by Li Jun 20230703
+>>>>>>> LEXCommunityLiJun
public Batch_FixAttachmentToFiles(String objectType, Datetime startTime, Datetime endTime) {
creStartDate = startTime;
creEndDate = endTime;
@@ -13,10 +22,17 @@
public Batch_FixAttachmentToFiles(Set<String> parentIds) {
this.parentIds = parentIds;
}
+<<<<<<< HEAD
//Add by Li Jun 20230703 End
global Database.QueryLocator start(Database.BatchableContext BC) {
String queryObject = 'SELECT Id, Name, OwnerId, ParentId, Parent.Name, Parent.Type, Body, CreatedDate, CreatedById FROM Attachment WHERE Parent.Type =:objectApiName AND CreatedDate >=:creStartDate AND CreatedDate <:creEndDate Order by CreatedDate ASC';
if (parentIds.size() > 0) {
+=======
+ //Add by Li Jun 20230703 End
+ global Database.QueryLocator start(Database.BatchableContext BC) {
+ String queryObject = 'SELECT Id, Name, OwnerId, ParentId, Parent.Name, Parent.Type, Body, CreatedDate, CreatedById FROM Attachment WHERE Parent.Type =:objectApiName AND CreatedDate >=:creStartDate AND CreatedDate <:creEndDate Order by CreatedDate ASC';
+ if(parentIds.size() > 0){
+>>>>>>> LEXCommunityLiJun
queryObject = 'SELECT Id, Name, OwnerId, ParentId, Parent.Name, Parent.Type, Body, CreatedDate, CreatedById FROM Attachment WHERE ParentId in:parentIds';
}
return Database.getQueryLocator(queryObject);
@@ -24,6 +40,7 @@
global void execute(Database.BatchableContext BC, List<Attachment> scope) {
List<ContentVersion> insertContents = new List<ContentVersion>();
+<<<<<<< HEAD
Map<string, id> nameParentMaps = new Map<string, id>();
Set<String> attachmentIds = new Set<String>();
for (Attachment att : scope) {
@@ -38,10 +55,27 @@
insertContents.add(cVersion);
}
if (insertContents.isEmpty()) {
+=======
+ Map<string,id> nameParentMaps = new Map<string,id>();
+ Set<String> attachmentIds = new Set<String>();
+ for (Attachment att : scope) {
+ nameParentMaps.put(att.Id, att.ParentId);
+ attachmentIds.add(att.Id);
+ ContentVersion cVersion = new ContentVersion();
+ cVersion.ContentLocation = 'S'; //S-Document is in Salesforce. E-Document is outside of Salesforce. L-Document is on a Social Netork.
+ cVersion.PathOnClient = att.Id; //File name with extention
+ cVersion.Origin = 'C'; //C-Content Origin. H-Chatter Origin.
+ cVersion.Title = att.Name; //Name of the file
+ cVersion.VersionData = att.Body; //File content
+ insertContents.add(cVersion);
+ }
+ if(insertContents.isEmpty()){
+>>>>>>> LEXCommunityLiJun
return;
}
//Insert insertContents;
List<Database.SaveResult> saveResultsContents = Database.insert(insertContents, false);
+<<<<<<< HEAD
insertLog(saveResultsContents, attachmentIds);
set<Id> contentIds = new Set<Id>();
for (ContentVersion cv : insertContents) {
@@ -58,29 +92,60 @@
cDocLink.ContentDocumentId = cv.ContentDocumentId; //Add ContentDocumentId
cDocLink.LinkedEntityId = nameParentMaps.get(cv.Title); //Add attachment parentId
cDocLink.ShareType = 'V'; //V - Viewer permission. C - Collaborator permission. I - Inferred permission.
+=======
+ insertLog(saveResultsContents,attachmentIds);
+ set<Id> contentIds = new set<Id>();
+ for(ContentVersion cv : insertContents){
+ contentIds.add(cv.id);
+ }
+ List<ContentVersion> conDocuments = [SELECT ContentDocumentId, Title,PathOnClient FROM ContentVersion WHERE Id in: contentIds];
+ List<ContentDocumentLink> insertDocLinks = new List<ContentDocumentLink>();
+ for(ContentVersion cv : conDocuments){
+ ContentDocumentLink cDocLink = new ContentDocumentLink();
+ cDocLink.ContentDocumentId = cv.ContentDocumentId; //Add ContentDocumentId
+ cDocLink.LinkedEntityId = nameParentMaps.get(cv.PathOnClient); //Add attachment parentId
+ cDocLink.ShareType = 'V'; //V - Viewer permission. C - Collaborator permission. I - Inferred permission.
+>>>>>>> LEXCommunityLiJun
cDocLink.Visibility = 'AllUsers';
insertDocLinks.add(cDocLink);
}
//Insert insertDocLinks;
List<Database.SaveResult> saveResultsLinks = Database.insert(insertDocLinks, false);
+<<<<<<< HEAD
insertLog(saveResultsLinks, attachmentIds);
}
global void insertLog(List<Database.SaveResult> saveResults, Set<String> attachmentIds) {
Transaction_Log__c traLog = new Transaction_Log__c();
List<Map<String, String>> logMapList = new List<Map<String, String>>();
+=======
+ insertLog(saveResultsLinks,attachmentIds);
+ }
+
+ global void insertLog(List<Database.SaveResult> saveResults,Set<String> attachmentIds) {
+ Transaction_Log__c traLog = new Transaction_Log__c();
+ List<Map<String,String>> logMapList = new List<Map<String,String>>();
+>>>>>>> LEXCommunityLiJun
for (Database.SaveResult result : saveResults) {
String recordId = result.getId();
if (!result.isSuccess()) {
for (Database.Error error : result.getErrors()) {
+<<<<<<< HEAD
Map<String, String> logMap = new Map<String, String>();
String errorMsg = error.getMessage();
logMap.put('recordId', recordId);
logMap.put('errorMsg', errorMsg);
+=======
+ Map<String,String> logMap = new Map<String,String>();
+ String errorMsg = error.getMessage();
+ logMap.put('recordId',recordId);
+ logMap.put('errorMsg',errorMsg);
+>>>>>>> LEXCommunityLiJun
logMapList.add(logMap);
}
}
}
+<<<<<<< HEAD
if (logMapList.size() > 0) {
Map<String, String> attachmentIdMap = new Map<String, String>();
attachmentIdMap.put('attachmentIds', JSON.serialize(attachmentIds));
@@ -94,3 +159,21 @@
global void finish(Database.BatchableContext BC) {
}
}
+=======
+ if(logMapList.size() > 0){
+ Map<String,String> attachmentIdMap = new Map<String,String>();
+ attachmentIdMap.put('attachmentIds',JSON.serialize(attachmentIds));
+ logMapList.add(attachmentIdMap);
+ traLog.Response__c = JSON.serialize(logMapList);
+ traLog.Module__c = 'Attachment COnvert Transaction ';
+ Insert traLog;
+ }
+ }
+
+
+
+ global void finish(Database.BatchableContext BC) {
+
+ }
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1