From 1f0e4e168dc9f8ae1e63ae46b06f1000f68cab57 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Thu, 16 Jan 2025 09:58:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3300)=20-=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=98=E6=B4=BD=E7=AD=BE=E5=85=B3=E8=81=94=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../changerecord/ChangeRecordRelationApi.java | 8 +++ .../visa/api/response/VisaRelationResp.java | 50 +++++++++++++++++++ .../ChangeRecordRelationController.java | 14 ++++++ .../server/domain/ChangeRecordRelation.java | 4 +- 4 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 visa/visa-api/src/main/java/cn/axzo/visa/api/response/VisaRelationResp.java diff --git a/visa/visa-api/src/main/java/cn/axzo/visa/api/changerecord/ChangeRecordRelationApi.java b/visa/visa-api/src/main/java/cn/axzo/visa/api/changerecord/ChangeRecordRelationApi.java index 4fc2b859..21d1702a 100644 --- a/visa/visa-api/src/main/java/cn/axzo/visa/api/changerecord/ChangeRecordRelationApi.java +++ b/visa/visa-api/src/main/java/cn/axzo/visa/api/changerecord/ChangeRecordRelationApi.java @@ -1,7 +1,12 @@ package cn.axzo.visa.api.changerecord; +import cn.axzo.framework.domain.web.result.ApiResult; +import cn.axzo.visa.api.enums.VisaRelationFieldEnum; +import cn.axzo.visa.api.response.VisaRelationResp; import org.springframework.cloud.openfeign.FeignClient; +import java.util.List; + /** * @author xudawei * @date 2025/01/15 @@ -10,6 +15,9 @@ import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "nanopart", url = "${axzo.service.nanopart:http://nanopart:8080}") public interface ChangeRecordRelationApi { + ApiResult> listByVisaId(String visaId); + + ApiResult> listByVisaId(String visaId, VisaRelationFieldEnum fieldEnum); } diff --git a/visa/visa-api/src/main/java/cn/axzo/visa/api/response/VisaRelationResp.java b/visa/visa-api/src/main/java/cn/axzo/visa/api/response/VisaRelationResp.java new file mode 100644 index 00000000..2c6f25a2 --- /dev/null +++ b/visa/visa-api/src/main/java/cn/axzo/visa/api/response/VisaRelationResp.java @@ -0,0 +1,50 @@ +package cn.axzo.visa.api.response; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +/** + * 变洽签关联的行数据相应模型 + * + * @author wangli + * @since 2025-01-16 09:50 + */ +@Data +@Accessors(chain = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class VisaRelationResp { + + private Long id; + /** + * 变洽签主单据编号 + */ + private String visaId; + /** + * 变洽签单据关联的行数据类型 + * {@link cn.axzo.visa.api.enums.VisaRelationFieldEnum} + */ + private String varName; + + /** + * 数据类型的扩展内容 + */ + private String varExt; + /** + * 数据值的 java 类型 + */ + private String varType; + /** + * 数据值 + */ + private String content; + /** + * 数据值的一些额外描述 + */ + private String content_ext; + +} diff --git a/visa/visa-server/src/main/java/cn/axzo/visa/server/controller/ChangeRecordRelationController.java b/visa/visa-server/src/main/java/cn/axzo/visa/server/controller/ChangeRecordRelationController.java index e939939c..c1ac4d6f 100644 --- a/visa/visa-server/src/main/java/cn/axzo/visa/server/controller/ChangeRecordRelationController.java +++ b/visa/visa-server/src/main/java/cn/axzo/visa/server/controller/ChangeRecordRelationController.java @@ -1,12 +1,17 @@ package cn.axzo.visa.server.controller; +import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.visa.api.changerecord.ChangeRecordRelationApi; +import cn.axzo.visa.api.enums.VisaRelationFieldEnum; +import cn.axzo.visa.api.response.VisaRelationResp; import cn.axzo.visa.server.service.ChangeRecordRelationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @author xudawei * @date 2025/01/15 @@ -20,4 +25,13 @@ public class ChangeRecordRelationController implements ChangeRecordRelationApi { @Autowired private ChangeRecordRelationService changeRecordRelationService; + @Override + public ApiResult> listByVisaId(String visaId) { + return null; + } + + @Override + public ApiResult> listByVisaId(String visaId, VisaRelationFieldEnum fieldEnum) { + return null; + } } diff --git a/visa/visa-server/src/main/java/cn/axzo/visa/server/domain/ChangeRecordRelation.java b/visa/visa-server/src/main/java/cn/axzo/visa/server/domain/ChangeRecordRelation.java index 2c6e630e..3d09f71b 100644 --- a/visa/visa-server/src/main/java/cn/axzo/visa/server/domain/ChangeRecordRelation.java +++ b/visa/visa-server/src/main/java/cn/axzo/visa/server/domain/ChangeRecordRelation.java @@ -56,8 +56,8 @@ public class ChangeRecordRelation extends BaseEntity { /** * 内容描述 */ - @TableField(value = "description") - private String description; + @TableField(value = "content_ext") + private String content_ext; /** * 创建人id