wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3581: 下载合同

Browse Source
This commit is contained in:
yanglin 2025-02-21 13:49:02 +08:00
parent 9130acd9b8
commit bb1b0d92ea
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java
View File

@ -148,8 +148,8 @@ public class EssContract extends BaseEntity<EssContract> {
return approvers.stream().allMatch(Approver::isSignPersonPresent); return approvers.stream().allMatch(Approver::isSignPersonPresent);
} }
public boolean downloadContract() { public boolean shouldDownloadContract() {
return isFinalState() || getOrCreateExt().isDownloadContract(); return isFinalState() || getOrCreateExt().isShouldDownloadContract();
} }
public boolean isFinalState() { public boolean isFinalState() {
@ -168,7 +168,7 @@ public class EssContract extends BaseEntity<EssContract> {
@Setter @Setter
@Getter @Getter
public static class RecordExt { public static class RecordExt {
private boolean downloadContract; private boolean shouldDownloadContract;
} }
// @formatter:off // @formatter:off

4
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java
View File

@ -161,7 +161,7 @@ public class EssService {
public void saveContractSnapshot(String essContractId) { public void saveContractSnapshot(String essContractId) {
EssContract c = transactionTemplate.execute(unused -> { EssContract c = transactionTemplate.execute(unused -> {
EssContract contract = essContractDao.getOrThrow(essContractId); EssContract contract = essContractDao.getOrThrow(essContractId);
contract.getRecordExt().setDownloadContract(true); contract.getRecordExt().setShouldDownloadContract(true);
essContractDao.updateExt(contract); essContractDao.updateExt(contract);
return contract; return contract;
}); });
@ -177,7 +177,7 @@ public class EssService {
essSupport.asyncExec(() -> { essSupport.asyncExec(() -> {
try { try {
EssContract c = essContractDao.findOrNull(contract.getEssContractId()); 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; return;
String pdfUrl = getContractPDFUrlFromEss(c); String pdfUrl = getContractPDFUrlFromEss(c);
String fileName = String.format("%s.pdf", c.getContractName()); String fileName = String.format("%s.pdf", c.getContractName());