parent
62dd9db39b
commit
a6276d5d21
@ -1066,6 +1066,21 @@ public class CommonServiceImpl implements CommonService {
|
|||||||
map.put("name", "new_id");
|
map.put("name", "new_id");
|
||||||
list.add(map);
|
list.add(map);
|
||||||
|
|
||||||
|
//DeleteEvent 回收站新增是否删除,数据内同字段
|
||||||
|
if ("DeleteEvent".equals(apiName)){
|
||||||
|
Map<String, Object> map1 = Maps.newHashMap();
|
||||||
|
map1.put("type", "tinyint(1) DEFAULT 0");
|
||||||
|
map1.put("comment", "是否删除");
|
||||||
|
map1.put("name", "is_delete");
|
||||||
|
list.add(map1);
|
||||||
|
|
||||||
|
Map<String, Object> map2 = Maps.newHashMap();
|
||||||
|
map2.put("type", "text");
|
||||||
|
map2.put("comment", "完整数据");
|
||||||
|
map2.put("name", "all_data");
|
||||||
|
list.add(map2);
|
||||||
|
}
|
||||||
|
|
||||||
customMapper.createTable(apiName, label, list, index);
|
customMapper.createTable(apiName, label, list, index);
|
||||||
// 生成字段映射
|
// 生成字段映射
|
||||||
QueryWrapper<DataField> delfieldQw = new QueryWrapper<>();
|
QueryWrapper<DataField> delfieldQw = new QueryWrapper<>();
|
||||||
|
|||||||
@ -1062,6 +1062,9 @@ public class DataImportBatchServiceImpl implements DataImportBatchService {
|
|||||||
dbQw.eq("api", api);
|
dbQw.eq("api", api);
|
||||||
List<DataField> list = dataFieldService.list(dbQw);
|
List<DataField> list = dataFieldService.list(dbQw);
|
||||||
TimeUnit.MILLISECONDS.sleep(1);
|
TimeUnit.MILLISECONDS.sleep(1);
|
||||||
|
QueryWrapper<DataObject> obQw = new QueryWrapper<>();
|
||||||
|
dbQw.eq("api", api);
|
||||||
|
DataObject dataObject = dataObjectService.getOne(obQw);
|
||||||
|
|
||||||
String beginDateStr = null;
|
String beginDateStr = null;
|
||||||
String endDateStr = 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();
|
ids[j-1] = data.get(j-1).get("Id").toString();
|
||||||
insertList.add(account);
|
insertList.add(account);
|
||||||
if (i*10000+j == count){
|
if (i*10000+j == count){
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user