From a6276d5d21555c7cf0acd26315dd2fa8aa29e3e2 Mon Sep 17 00:00:00 2001 From: Kris <2893855659@qq.com> Date: Thu, 31 Jul 2025 10:09:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E6=80=A7=E6=8F=92=E5=85=A5=E5=86=99=E5=85=A5old=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit cd016429b784f117e72eb901ddfb0bfcec971a61) --- .../datadump/service/impl/CommonServiceImpl.java | 15 +++++++++++++++ .../service/impl/DataImportBatchServiceImpl.java | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java index da72e8c..77301e3 100644 --- a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java @@ -1066,6 +1066,21 @@ public class CommonServiceImpl implements CommonService { map.put("name", "new_id"); list.add(map); + //DeleteEvent 回收站新增是否删除，数据内同字段 + if ("DeleteEvent".equals(apiName)){ + Map map1 = Maps.newHashMap(); + map1.put("type", "tinyint(1) DEFAULT 0"); + map1.put("comment", "是否删除"); + map1.put("name", "is_delete"); + list.add(map1); + + Map map2 = Maps.newHashMap(); + map2.put("type", "text"); + map2.put("comment", "完整数据"); + map2.put("name", "all_data"); + list.add(map2); + } + customMapper.createTable(apiName, label, list, index); // 生成字段映射 QueryWrapper delfieldQw = new QueryWrapper<>(); diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java index 0c43b71..2082e02 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java @@ -1062,6 +1062,9 @@ public class DataImportBatchServiceImpl implements DataImportBatchService { dbQw.eq("api", api); List list = dataFieldService.list(dbQw); TimeUnit.MILLISECONDS.sleep(1); + QueryWrapper obQw = new QueryWrapper<>(); + dbQw.eq("api", api); + DataObject dataObject = dataObjectService.getOne(obQw); String beginDateStr = null; String endDateStr = null; @@ -1175,6 +1178,11 @@ public class DataImportBatchServiceImpl implements DataImportBatchService { } + if (dataObject.getIsEditable()){ + account.put("old_owner_id__c", data.get(j - 1).get("OwnerId")); + account.put("old_sfdc_id__c", data.get(j - 1).get("Id")); + } + ids[j-1] = data.get(j-1).get("Id").toString(); insertList.add(account); if (i*10000+j == count){