diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java index 36e7307..d5eb58d 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java @@ -447,17 +447,19 @@ public class DataImportNewServiceImpl implements DataImportNewService { List salesforceParams = null; QueryWrapper dbQw = new QueryWrapper<>(); dbQw.eq("name", api); - dbQw.gt("sync_end_date",dataObject.getLastUpdateDate()); - List dataBatches = dataBatchService.list(dbQw); + List list = dataBatchService.list(dbQw); AtomicInteger batch = new AtomicInteger(1); - if (CollectionUtils.isNotEmpty(dataBatches)) { - salesforceParams = dataBatches.stream().map(t -> { - SalesforceParam salesforceParam = param.clone(); - salesforceParam.setApi(t.getName()); - salesforceParam.setBeginCreateDate(t.getSyncStartDate()); - salesforceParam.setEndCreateDate(t.getSyncEndDate()); - salesforceParam.setBatch(batch.getAndIncrement()); - return salesforceParam; + if (CollectionUtils.isNotEmpty(list)) { + salesforceParams = list.stream().map(t -> { + if(t.getSyncEndDate().toInstant().isAfter(t.getLastModifiedDate().toInstant())){ + SalesforceParam salesforceParam = param.clone(); + salesforceParam.setApi(t.getName()); + salesforceParam.setBeginCreateDate(t.getSyncStartDate()); + salesforceParam.setEndCreateDate(t.getSyncEndDate()); + salesforceParam.setBatch(batch.getAndIncrement()); + return salesforceParam; + } + return null; }).collect(Collectors.toList()); } @@ -636,17 +638,19 @@ public class DataImportNewServiceImpl implements DataImportNewService { List salesforceParams = null; QueryWrapper dbQw = new QueryWrapper<>(); dbQw.eq("name", api); - dbQw.gt("sync_end_date",dataObject.getLastUpdateDate()); List list = dataBatchService.list(dbQw); AtomicInteger batch = new AtomicInteger(1); if (CollectionUtils.isNotEmpty(list)) { salesforceParams = list.stream().map(t -> { - SalesforceParam salesforceParam = param.clone(); - salesforceParam.setApi(t.getName()); - salesforceParam.setBeginCreateDate(t.getSyncStartDate()); - salesforceParam.setEndCreateDate(t.getSyncEndDate()); - salesforceParam.setBatch(batch.getAndIncrement()); - return salesforceParam; + if(t.getSyncEndDate().toInstant().isAfter(t.getLastModifiedDate().toInstant())){ + SalesforceParam salesforceParam = param.clone(); + salesforceParam.setApi(t.getName()); + salesforceParam.setBeginCreateDate(t.getSyncStartDate()); + salesforceParam.setEndCreateDate(t.getSyncEndDate()); + salesforceParam.setBatch(batch.getAndIncrement()); + return salesforceParam; + } + return null; }).collect(Collectors.toList()); } @@ -755,7 +759,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { if (!"null".equals(value) && StringUtils.isNotEmpty(value) && !"OwnerId".equals(field) && !"Owner_Type".equals(field) ) { //判断reference_to内是否包含User字符串 - if (reference_to.contains("User")) { + if (reference_to.contains(",User") || reference_to.contains("User,")) { reference_to = "User"; } Map m = customMapper.getById("new_id", reference_to, value);