From 311ed6518d65021f77953a134df0b0b0c052346e Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Thu, 27 Feb 2025 15:31:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3581)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E7=94=A8=E5=8D=B0=E7=9A=84=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=97=B6=E4=BC=A0=E5=85=A5=E7=BB=99=E5=BE=85=E5=8A=9E=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/api/constant/VisaConstant.java | 10 +++++--- .../nanopart/visa/server/rpc/EssGateway.java | 25 ++++++++++++++++--- .../impl/ChangeRecordRelationServiceImpl.java | 13 +++++++--- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/constant/VisaConstant.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/constant/VisaConstant.java index 31acf836..e3817e2e 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/constant/VisaConstant.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/constant/VisaConstant.java @@ -16,15 +16,19 @@ public interface VisaConstant { /** * 申请用印，针对单位创建的审批携带的 ouId */ - String WORKFLOW_VAR_STAMP_OU_ID = "stamp_ou_id"; + String WORKFLOW_VAR_STAMP_OU_ID = "stampOuId"; /** * 申请用印，针对单位的签章类型 */ - String WORKFLOW_VAR_STAMP_TYPE = "stamp_type"; + String WORKFLOW_VAR_STAMP_TYPE = "stampType"; /** * 申请用印，针对单位的签章位置 */ - String WORKFLOW_VAR_STAMP_RECIPIENT = "stamp_recipient"; + String WORKFLOW_VAR_STAMP_RECIPIENT = "stampRecipient"; + /** + * 申请用印，合同 ID + */ + String WORKFLOW_VAR_STAMP_CONTRACT_ID = "stampContractId"; /** * 用于发送待办的变量名 diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/EssGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/EssGateway.java index 1715e760..2c68d586 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/EssGateway.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/EssGateway.java @@ -1,17 +1,20 @@ package cn.axzo.nanopart.visa.server.rpc; +import cn.axzo.basics.common.util.AssertUtil; +import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.nanopart.ess.api.EssApi; import cn.axzo.nanopart.ess.api.domain.EssOrgAndSealInfo; import cn.axzo.nanopart.ess.api.request.CreateContractByFileRequest; import cn.axzo.nanopart.ess.api.request.GetSealsRequest; import cn.axzo.nanopart.ess.api.request.SaveContractSnapshotRequest; import cn.axzo.nanopart.ess.api.response.CreateContractByFileResponse; -import cn.axzo.pokonyan.util.RpcUtil; +import cn.azxo.framework.common.logger.MethodAroundLog; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 腾讯电子签 @@ -26,15 +29,29 @@ public class EssGateway { private final EssApi essApi; + @MethodAroundLog(target = "maokai", source = "nanopart", value = "创建电子签合同") public CreateContractByFileResponse createContract(CreateContractByFileRequest request) { - return RpcUtil.rpcApiResultProcessor(() -> essApi.createContractByFile(request), "创建电子签合同", request); + ApiResult apiResult = essApi.createContractByFile(request); + if (apiResult.isSuccess() && Objects.nonNull(apiResult.getData())) { + return apiResult.getData(); + } + AssertUtil.isTrue(apiResult.isSuccess(), apiResult.getMsg()); + return null; } + @MethodAroundLog(target = "maokai", source = "nanopart", value = "查询单位已启用的印章以及授权人员列表") public List getOrgEnabledSeals(GetSealsRequest request) { - return RpcUtil.rpcApiResultProcessor(() -> essApi.getOrgEnabledSeals(request), "查询单位已启用的印章以及授权人员列表", request); + ApiResult> apiResult = essApi.getOrgEnabledSeals(request); + if (apiResult.isSuccess() && Objects.nonNull(apiResult.getData())) { + return apiResult.getData(); + } + AssertUtil.isTrue(apiResult.isSuccess(), apiResult.getMsg()); + return null; } + @MethodAroundLog(target = "maokai", source = "nanopart", value = "查询单位已启用的印章以及授权人员列表") public void saveContractSnapshot(SaveContractSnapshotRequest request) { - RpcUtil.rpcApiResultProcessor(() -> essApi.saveContractSnapshot(request), "从腾讯电子签下载合同PDF文件", request); + ApiResult apiResult = essApi.saveContractSnapshot(request); + AssertUtil.isTrue(apiResult.isSuccess(), apiResult.getMsg()); } } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java index ee011319..f364ccb4 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java @@ -26,6 +26,7 @@ import cn.axzo.nanopart.visa.api.enums.VisaButtonTypeEnum; import cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum; import cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum; import cn.axzo.nanopart.visa.api.enums.VisaRelationVarTypeEnum; +import cn.axzo.nanopart.visa.api.enums.VisaStampStatusEnum; import cn.axzo.nanopart.visa.api.enums.VisaStatusEnum; import cn.axzo.nanopart.visa.api.request.ChangeRecordAppendAttachReq; import cn.axzo.nanopart.visa.api.request.ImGroupOperationClearReq; @@ -100,6 +101,7 @@ import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_PARTICIPA import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_PARTICIPATE_TIPS_OPERATED; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.MSG_CENTER_APP_CODE; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_PENDING_INITIATOR_NAME; +import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_VAR_STAMP_CONTRACT_ID; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_VAR_STAMP_OU_ID; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_VAR_STAMP_RECIPIENT; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_VAR_STAMP_TYPE; @@ -462,6 +464,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl essRecipientIdMap = new HashMap<>(); @@ -667,12 +671,15 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl variables = Maps.of( IM_GROUP_BIZ_INFO_VISA_ID, visa.getId(), WORKFLOW_VAR_STAMP_OU_ID, model.getOuId(), WORKFLOW_VAR_STAMP_TYPE, model.getSealType().name(), - WORKFLOW_VAR_STAMP_RECIPIENT, MapUtils.emptyIfNull(essRecipientIdMap).getOrDefault(model.getOuId(), "") - )); + WORKFLOW_VAR_STAMP_RECIPIENT, MapUtils.emptyIfNull(essRecipientIdMap).getOrDefault(model.getOuId(), ""), + WORKFLOW_VAR_STAMP_CONTRACT_ID, visa.getContractId() + ); + create.setVariables(variables); + create.setPendingVariables(variables); return workflowGateway.processInstanceCreate(create); }