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-13 16:47:14 +08:00
parent 285496f0b4
commit 170d44bd7e
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/EssApi.java
View File

@ -115,7 +115,7 @@ public interface EssApi {
@RequestBody @Valid GetContractSignUrlRequest request);
/**
* 下载已签署的合同PDF, 只有合同签署完成才能下载. 下载链接有效期为5分钟
* 下载已签署的合同PDF. 下载链接有效期为5分钟
*/
@PostMapping("api/ess/getContractPDFUrl")
ApiResult<DownloadSingedContractPdfResponse> getContractPDFUrl(

21
ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/enums/EssContractState.java
View File

@ -11,21 +11,22 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public enum EssContractState {
INIT("合同创建", false),
PART("合同签署中", false),
ALL("合同签署完成", true),
REJECT("合同拒签", true),
CANCEL("合同撤回", true),
WILLEXPIRE("合同即将过期", false),
DEADLINE("合同流签(合同过期)", true),
RELIEVED("解除协议（已解除)", true),
INVALID("合同失效", true),
EXCEPTION("合同异常", true),
INIT("合同创建", false, false),
PART("合同签署中", false, false),
ALL("合同签署完成", true, true),
REJECT("合同拒签", true, false),
CANCEL("合同撤回", true, false),
WILLEXPIRE("合同即将过期", false, false),
DEADLINE("合同流签(合同过期)", true, true),
RELIEVED("解除协议（已解除)", true, false),
INVALID("合同失效", true, false),
EXCEPTION("合同异常", true, false),
;
private final String description;
private final boolean finalState;
private final boolean pdfDownloadable;
public static EssContractState fromEssCode(String code) {
for (EssContractState value : values()) {

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

@ -1,6 +1,5 @@
package cn.axzo.nanopart.ess.server.ess;
import cn.axzo.nanopart.ess.api.enums.EssContractState;
import cn.axzo.nanopart.ess.api.request.AddSealAuthorizationRequest;
import cn.axzo.nanopart.ess.api.request.CreateConsoleLoginUrlRequest;
import cn.axzo.nanopart.ess.api.request.DownloadSingedContractPdfRequest;
@ -101,7 +100,6 @@ public class EssService {
.find(request.getEssContractId()).orElse(null);
BizAssertions.assertNotNull(contract, "合同不存在: {}", request.getEssContractId());
//noinspection DataFlowIssue
BizAssertions.assertTrue(contract.getState() == EssContractState.ALL, "合同未签署完成, 无法下载");
EssPerson superAdmin = orgManager.getSuperAdminOrThrow(contract.getCreatorOuId());
return essClient.getContractPDFUrl(superAdmin, contract.getEssContractId());
}