diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java index 634698b1..cbb9f2cd 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java @@ -108,7 +108,7 @@ public class EssContract extends BaseEntity { @TableField(typeHandler = FastjsonTypeHandler.class) private RecordExt recordExt; - public boolean isSavedOnOss() { + public boolean isUploadedToOss() { return StringUtils.isNotBlank(ossFileKey); } diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java index 3ff30559..0b9eacdf 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java @@ -169,7 +169,7 @@ public class EssService { public String getContractPDFUrl(String essContractId) { EssContract contract = essContractDao.getOrThrow(essContractId); - if (contract.isSavedOnOss()) + if (contract.isUploadedToOss()) return ossService.getOssUrl(contract.getOssFileKey()); // 尝试做补偿 maybeScheduleDownloadContractPDF(contract, false); @@ -194,7 +194,7 @@ public class EssService { private boolean scheduleDownloadPdf(EssContract contract, boolean retryDownload) { if (contract == null) return false; - if (contract.isSavedOnOss() && !retryDownload) + if (contract.isUploadedToOss() && !retryDownload) return false; return contract.shouldDownloadContract(); } @@ -205,7 +205,7 @@ public class EssService { log.info("合同不需要下载PDF, contract={}", contract); return; } - if (contract.isFinalState() && contract.isSavedOnOss()) { + if (contract.isFinalState() && contract.isUploadedToOss()) { log.info("合同已是终态且已下载PDF, contract={}", contract); return; }