From 7c5f22f69a12647df7530ab7e7e09c405d073200 Mon Sep 17 00:00:00 2001 From: yanglin Date: Mon, 24 Feb 2025 11:06:05 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E6=B7=BB=E5=8A=A0bizCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanopart/ess/api/domain/contract/EssContractInfo.java | 5 +++++ .../nanopart/ess/api/request/CreateContractRequest.java | 6 ++++++ .../cn/axzo/nanopart/ess/server/entity/EssContract.java | 5 +++++ .../nanopart/ess/server/ess/support/ContractSupport.java | 1 + .../service/impl/ChangeRecordRelationServiceImpl.java | 1 + 5 files changed, 18 insertions(+) diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/EssContractInfo.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/EssContractInfo.java index 81c9ba97..f437b5d9 100644 --- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/EssContractInfo.java +++ b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/EssContractInfo.java @@ -18,6 +18,11 @@ public class EssContractInfo { */ private String appCode; + /** + * 业务编码 + */ + private String bizCode; + /** * 幂等编码 */ diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/CreateContractRequest.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/CreateContractRequest.java index e6d0db6f..4bdfaa48 100644 --- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/CreateContractRequest.java +++ b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/CreateContractRequest.java @@ -25,6 +25,12 @@ public abstract class CreateContractRequest { @NotBlank(message = "appCode不能为空") private String appCode; + /** + * 业务编码 + */ + @NotNull(message = "bizCode不能为空") + private String bizCode = ""; + /** * 幂等编码, 最大长度200. 使用appCode和idempotentCode的合同不能重复 */ 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 cfab43a3..bb513fe5 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 @@ -32,6 +32,11 @@ public class EssContract extends BaseEntity { */ private String appCode; + /** + * 业务编码 + */ + private String bizCode; + /** * 幂等编码 */ diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/ContractSupport.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/ContractSupport.java index 751646d9..19f9f909 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/ContractSupport.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/ContractSupport.java @@ -62,6 +62,7 @@ public class ContractSupport { public EssContract saveContractByFile(CreateContractByFileRequest request) { EssContract contract = new EssContract(); contract.setAppCode(request.getAppCode()); + contract.setBizCode(request.getBizCode()); contract.setIdempotentCode(request.getIdempotentCode()); contract.setCreatorOuId(request.getCreator().getOuId()); contract.setCreatorPersonId(request.getCreator().getPersonId()); 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 12e20bc6..bbd22b42 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 @@ -450,6 +450,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl