From bb1b0d92ea70a7e34612820500ca30191ea2e50a Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Fri, 21 Feb 2025 13:49:02 +0800
Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E4=B8=8B=E8=BD=BD=E5=90=88?=
 =?UTF-8?q?=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/axzo/nanopart/ess/server/entity/EssContract.java     | 6 +++---
 .../java/cn/axzo/nanopart/ess/server/ess/EssService.java    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 032f31bc..296d570a 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
@@ -148,8 +148,8 @@ public class EssContract extends BaseEntity<EssContract> {
         return approvers.stream().allMatch(Approver::isSignPersonPresent);
     }
 
-    public boolean downloadContract() {
-        return isFinalState() || getOrCreateExt().isDownloadContract();
+    public boolean shouldDownloadContract() {
+        return isFinalState() || getOrCreateExt().isShouldDownloadContract();
     }
 
     public boolean isFinalState() {
@@ -168,7 +168,7 @@ public class EssContract extends BaseEntity<EssContract> {
     @Setter
     @Getter
     public static class RecordExt {
-        private boolean downloadContract;
+        private boolean shouldDownloadContract;
     }
 
     // @formatter:off
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 1e2f1064..784ad1fc 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
@@ -161,7 +161,7 @@ public class EssService {
     public void saveContractSnapshot(String essContractId) {
         EssContract c = transactionTemplate.execute(unused -> {
             EssContract contract = essContractDao.getOrThrow(essContractId);
-            contract.getRecordExt().setDownloadContract(true);
+            contract.getRecordExt().setShouldDownloadContract(true);
             essContractDao.updateExt(contract);
             return contract;
         });
@@ -177,7 +177,7 @@ public class EssService {
         essSupport.asyncExec(() -> {
             try {
                 EssContract c = essContractDao.findOrNull(contract.getEssContractId());
-                if (c == null || c.downloadContract() || StringUtils.isNotBlank(c.getOssFileKey()))
+                if (c == null || c.shouldDownloadContract() || StringUtils.isNotBlank(c.getOssFileKey()))
                     return;
                 String pdfUrl = getContractPDFUrlFromEss(c);
                 String fileName = String.format("%s.pdf", c.getContractName());