From 9459e626a817d1f1f04cee38abfc8a923b04dc7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= Date: Mon, 24 Feb 2025 09:38:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:(feature/REQ-3581)=20=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E7=AD=BE=E8=AF=81=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=88=E5=90=8Cid=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/nanopart/visa/api/response/VisaSearchResp.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaSearchResp.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaSearchResp.java index e610fd33..d45ede40 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaSearchResp.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaSearchResp.java @@ -146,4 +146,9 @@ public class VisaSearchResp { * @see VisaStampStatusEnum */ private String stampStatus; + + /** + * 合同id + */ + private String contractId; } From 276e1e871db78d9ee9b3c2578e588f60eac64a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= Date: Mon, 24 Feb 2025 10:22:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:(feature/REQ-3581)=20=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E7=AD=BE=E8=AF=81=E7=94=A8=E5=8D=B0=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=B6=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/api/enums/VisaLogTypeEnum.java | 3 ++ .../visa/api/request/UpdateVisaChangeReq.java | 9 +++- .../service/impl/ChangeRecordServiceImpl.java | 43 ++++++++++++++++++- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaLogTypeEnum.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaLogTypeEnum.java index 2bc931f2..f6072a3f 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaLogTypeEnum.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaLogTypeEnum.java @@ -31,6 +31,9 @@ public enum VisaLogTypeEnum { TRANSMIT_APPROVE("transmit_approve", "审批流操作：转交","审批人变更", "%s将审批转交至%s，原因为%s"), FALLBACK_APPROVE("fallback_approve", "审批流操作：回退","%s回退审批", "%s回退审批至审批节点：%s"), APPROVE_COMPLETED("approved_completed", "审批流：审批通过","%s通过", "%s流程已完成"), + CANCEL_STAMP("stamp_canceled", "操作取消用印","%s取消用印", "%s操作取消单据用印申请"), + COMPLETE_STAMP("stamp_complete", "操作完成用印","%s完成用印", "%s操作完成用印"), + AUTO_COMPLETE_STAMP("stamp_auto_complete", "电子签合同状态\"签署完成\"回调时","用印成功", "单据用印申请均签署通过！"), ; /** diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/UpdateVisaChangeReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/UpdateVisaChangeReq.java index 642bf5bb..47fb7781 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/UpdateVisaChangeReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/UpdateVisaChangeReq.java @@ -27,6 +27,9 @@ public class UpdateVisaChangeReq { @NotNull(message = "操作人不能为空") private Long operatorId; + @NotNull(message = "操作人名字不能为空") + private String operatorName; + /** * 变更签证用印操作 */ @@ -41,8 +44,10 @@ public class UpdateVisaChangeReq { @AllArgsConstructor(access = AccessLevel.PRIVATE) public enum VisaStampAction { - COMPLETE("完成用印"), - CANCEL("取消用印"); + COMPLETE("用户完成用印"), + CANCEL("取消用印"), + // 所有审批流审批完成时，自动完成审批，要区别手动完成用印操作，记录日志 + AUTO_COMPLETE("自动完成用印"); private String desc; } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index ea9573ad..d54d5496 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -42,7 +42,6 @@ import cn.axzo.nanopart.visa.api.enums.VisaConfirmBizTypeEnum; 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.enums.VisaTypeEnum; import cn.axzo.nanopart.visa.api.request.ChangeRecordButtonOperationReq; @@ -167,6 +166,9 @@ import static cn.axzo.nanopart.visa.api.constant.VisaConstant.MSG_CENTER_APP_COD import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_PENDING_INITIATOR_NAME; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_PENDING_TOPIC; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_VAR_VISA_TYPE_KEY; +import static cn.axzo.nanopart.visa.api.request.UpdateVisaChangeReq.VisaStampAction.AUTO_COMPLETE; +import static cn.axzo.nanopart.visa.api.request.UpdateVisaChangeReq.VisaStampAction.CANCEL; +import static cn.axzo.nanopart.visa.api.request.UpdateVisaChangeReq.VisaStampAction.COMPLETE; import static cn.axzo.nanopart.visa.server.config.BizResultCode.CHANGE_RECORD_NOT_FOUND; import static cn.axzo.nanopart.visa.server.utils.Constants.DATE_FORMAT; import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.PROCESSING; @@ -1939,6 +1941,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl