diff --git a/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java index c43a2cf..a94926a 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java @@ -616,8 +616,7 @@ public class DataVerifyServiceImpl implements DataVerifyService { // 为每个批次单独创建校验文件 String batchQualityCheckFilePath = generateObjectQualityCheckFilePath(objectApi + "_" + batch.getId()); try (ExcelWriter objectWriter = EasyExcel.write(batchQualityCheckFilePath).build()) { - WriteSheet detailSheet = createDetailSheet(excelWriter, dataObject); - batchHasError = processDataBatch(batch, objectApi, fields, excelWriter, objectWriter, summarySheet, detailSheet, sourceConn, targetConn, fieldMap, ignoreBeginDate) || batchHasError; + batchHasError = processDataBatch(batch, objectApi, fields, excelWriter, objectWriter, summarySheet, dataObject, sourceConn, targetConn, fieldMap, ignoreBeginDate) || batchHasError; }catch (Exception e){ log.error("API={},批次ID={}处理异常:{}",objectApi,batch.getId(), e.getMessage(),e); } @@ -636,10 +635,9 @@ public class DataVerifyServiceImpl implements DataVerifyService { }else { boolean hasError = false; try (ExcelWriter objectWriter = EasyExcel.write(qualityCheckFilePath).build()) { - WriteSheet detailSheet = createDetailSheet(excelWriter, dataObject); for (DataBatch batch : batches) { - hasError = processDataBatch(batch, objectApi, fields, excelWriter, objectWriter, summarySheet, detailSheet, sourceConn, targetConn, fieldMap, ignoreBeginDate) || hasError; + hasError = processDataBatch(batch, objectApi, fields, excelWriter, objectWriter, summarySheet,dataObject, sourceConn, targetConn, fieldMap, ignoreBeginDate) || hasError; } }catch (Exception e){ log.error("API={},处理异常:{}",objectApi, e.getMessage(),e); @@ -751,8 +749,11 @@ public class DataVerifyServiceImpl implements DataVerifyService { * 处理单个数据批次 */ private boolean processDataBatch(DataBatch batch, String objectApi, List fields, - ExcelWriter excelWriter,ExcelWriter objectWriter, WriteSheet summarySheet, WriteSheet detailSheet, + ExcelWriter excelWriter,ExcelWriter objectWriter, WriteSheet summarySheet, DataObject dataObject, PartnerConnection sourceConn, PartnerConnection targetConn,Map> fieldMap, Date ignoreBeginDate) { + + WriteSheet detailSheet = createDetailSheet(excelWriter, dataObject); + String startDate = DateFormatUtils.format(batch.getSyncStartDate(), "yyyy-MM-dd HH:mm:ss"); String endDate = DateFormatUtils.format(batch.getSyncEndDate(), "yyyy-MM-dd HH:mm:ss");