From f9e4e02273e3516faff5cd55428715aadb122680 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Fri, 18 Sep 2020 11:29:02 +0200
Subject: [PATCH] =?UTF-8?q?#1065468=5FLeadimportReset=5FMariaDBBugfix=20?=
=?UTF-8?q?=C3=84nderung=20am=20Delete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../leadimportreset/onActionProcess.js | 27 ++++++++++---------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
index e3ab27e0a1..da2f76e57b 100644
--- a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
+++ b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
@@ -22,14 +22,14 @@ _deleteData("COMMUNICATION", leadimportId, dateADayBefore);
_deleteData("AB_ATTRIBUTERELATION", leadimportId, dateADayBefore);
newWhere("LEADLOG.LEADIMPORT_ID", leadimportId)
-.and("LEADLOG.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
-.from("LEADLOG")
-.deleteData();
+ .and("LEADLOG.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
+ .from("LEADLOG")
+ .deleteData();
newWhere("LEAD.LEADIMPORT_ID", leadimportId)
-.and("LEAD.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
-.from("LEAD")
-.deleteData();
+ .and("LEAD.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
+ .from("LEAD")
+ .deleteData();
// Ändern des Status auf Created
newWhere("LEADIMPORT.LEADIMPORTID", leadimportId).updateData(true, "LEADIMPORT", ["Status"], null, [$KeywordRegistry.importStatus$created()]);
@@ -46,12 +46,15 @@ function _deleteData (pTableName, pleadimportId, pdateADayBefor)
{
let uTableName = pTableName.charAt(0);
newWhere(pTableName + "." + pTableName + "ID",
- newSelect(uTableName + "." + pTableName + "ID")
- .from(pTableName, uTableName)
- .join("LEADLOG", "LEADLOG.DATE_NEW = " + uTableName + ".DATE_NEW")
- .where(uTableName + ".USER_NEW = LEADLOG.USER_NEW")
- .and("LEADLOG.LEADIMPORT_ID", pleadimportId)
- .and("LEADLOG.DATE_NEW", pdateADayBefor.getTime(), "# >= ?"), SqlBuilder.IN())
+ newSelect("TAB." + pTableName + "ID")
+ .from(
+ newSelect(uTableName + "." + pTableName + "ID")
+ .from(pTableName, uTableName)
+ .join("LEADLOG", "LEADLOG.DATE_NEW = " + uTableName + ".DATE_NEW")
+ .where(uTableName + ".USER_NEW = LEADLOG.USER_NEW")
+ .and("LEADLOG.LEADIMPORT_ID", pleadimportId)
+ .and("LEADLOG.DATE_NEW", pdateADayBefor.getTime(),SqlBuilder.GREATER_OR_EQUAL())
+ , "TAB"), SqlBuilder.IN())
.from(pTableName)
.deleteData();
}
\ No newline at end of file
--
GitLab