REQ-3581: 加上上下文
This commit is contained in:
parent
f31a7313ef
commit
f5fd1db75f
@ -108,7 +108,7 @@ public class EssContract extends BaseEntity<EssContract> {
|
|||||||
@TableField(typeHandler = FastjsonTypeHandler.class)
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
||||||
private RecordExt recordExt;
|
private RecordExt recordExt;
|
||||||
|
|
||||||
public boolean isSavedOnOss() {
|
public boolean isUploadedToOss() {
|
||||||
return StringUtils.isNotBlank(ossFileKey);
|
return StringUtils.isNotBlank(ossFileKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -169,7 +169,7 @@ public class EssService {
|
|||||||
|
|
||||||
public String getContractPDFUrl(String essContractId) {
|
public String getContractPDFUrl(String essContractId) {
|
||||||
EssContract contract = essContractDao.getOrThrow(essContractId);
|
EssContract contract = essContractDao.getOrThrow(essContractId);
|
||||||
if (contract.isSavedOnOss())
|
if (contract.isUploadedToOss())
|
||||||
return ossService.getOssUrl(contract.getOssFileKey());
|
return ossService.getOssUrl(contract.getOssFileKey());
|
||||||
// 尝试做补偿
|
// 尝试做补偿
|
||||||
maybeScheduleDownloadContractPDF(contract, false);
|
maybeScheduleDownloadContractPDF(contract, false);
|
||||||
@ -194,7 +194,7 @@ public class EssService {
|
|||||||
private boolean scheduleDownloadPdf(EssContract contract, boolean retryDownload) {
|
private boolean scheduleDownloadPdf(EssContract contract, boolean retryDownload) {
|
||||||
if (contract == null)
|
if (contract == null)
|
||||||
return false;
|
return false;
|
||||||
if (contract.isSavedOnOss() && !retryDownload)
|
if (contract.isUploadedToOss() && !retryDownload)
|
||||||
return false;
|
return false;
|
||||||
return contract.shouldDownloadContract();
|
return contract.shouldDownloadContract();
|
||||||
}
|
}
|
||||||
@ -205,7 +205,7 @@ public class EssService {
|
|||||||
log.info("合同不需要下载PDF, contract={}", contract);
|
log.info("合同不需要下载PDF, contract={}", contract);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (contract.isFinalState() && contract.isSavedOnOss()) {
|
if (contract.isFinalState() && contract.isUploadedToOss()) {
|
||||||
log.info("合同已是终态且已下载PDF, contract={}", contract);
|
log.info("合同已是终态且已下载PDF, contract={}", contract);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user