|
|
|
@ -75,6 +75,7 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
String bufferDownUrl = bufferInfo.getDownUrl();
|
|
|
|
|
String serialnum = bufferInfo.getSerialnum();
|
|
|
|
|
// 设置地址或者文件信息
|
|
|
|
|
if (isSaveOrUpdateDownloadUrl) {
|
|
|
|
|
bufferInfo.setFileUrl(reportDto);
|
|
|
|
@ -83,7 +84,7 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
}
|
|
|
|
|
afReportRecordMapper.updateRecordBuffer(bufferInfo);
|
|
|
|
|
// 文件信息和地址都有,可以上报文件
|
|
|
|
|
boolean canReport = (isSaveOrUpdateDownloadUrl && Func.isBlank(bufferDownUrl)) || (!isSaveOrUpdateDownloadUrl && Func.isNotBlank(bufferDownUrl));
|
|
|
|
|
boolean canReport = (isSaveOrUpdateDownloadUrl && Func.isBlank(bufferDownUrl) && Func.isNotBlank(serialnum)) || (!isSaveOrUpdateDownloadUrl && Func.isNotBlank(bufferDownUrl));
|
|
|
|
|
if (canReport) {
|
|
|
|
|
afReportRecordMapper.cancelBlocking(bufferInfo.getId());
|
|
|
|
|
ReportDto dto = new ReportDto(bufferInfo);
|
|
|
|
|