From 0534fcd991832d8b7cf596f306489dacf04c796c Mon Sep 17 00:00:00 2001 From: guojunyun Date: Fri, 10 Oct 2025 17:34:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=B3=BB=E6=95=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/contract/CoefficientRespVO.java | 18 ++++------- .../vo/contract/CoefficientSaveReqVO.java | 29 +++++++----------- .../contract/ContractCoefficientDO.java | 30 +++++++------------ 3 files changed, 26 insertions(+), 51 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientRespVO.java index 56d258d..cd5c769 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientRespVO.java @@ -11,9 +11,6 @@ public class CoefficientRespVO { @Schema(description = "主键") private Long id; - @Schema(description = "配置主键") - private Long parameterId; - @Schema(description = "条款主键") private Long formulaId; @@ -26,24 +23,21 @@ public class CoefficientRespVO { @Schema(description = "金属元素名称") private String elementName; - @Schema(description = "系数值") - private String settlementCoefficient; - @Schema(description = "系数上限") private BigDecimal coefficientUp; @Schema(description = "系数下限") private BigDecimal coefficientDown; - @Schema(description = "是否包含上限") - private String isInUp; - - @Schema(description = "是否包含下限") - private String isInDown; + @Schema(description = "区间方式(字典：STLM_RNG_WY)") + private String rangeWay; @Schema(description = "是否省内") private String inState; - @Schema(description = "类型", example = "1") + @Schema(description = "类型") private String type; + + @Schema(description = "系数值") + private BigDecimal settlementCoefficient; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientSaveReqVO.java index 9f5c513..91c91bc 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientSaveReqVO.java @@ -1,23 +1,18 @@ package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import lombok.Data; + import java.math.BigDecimal; @Schema(description = "管理后台 - 基础系数配置新增/修改 Request VO") @Data public class CoefficientSaveReqVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31657") + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "27478") private Long id; - @Schema(description = "配置主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "6534") - @NotNull(message = "配置主键不能为空") - private Long parameterId; - - @Schema(description = "条款主键", example = "29652") + @Schema(description = "条款主键", example = "13898") private Long formulaId; @Schema(description = "金属元素编码") @@ -29,25 +24,21 @@ public class CoefficientSaveReqVO { @Schema(description = "金属元素名称", example = "芋艿") private String elementName; - @Schema(description = "系数值") - private String settlementCoefficient; - @Schema(description = "系数上限") private BigDecimal coefficientUp; @Schema(description = "系数下限") private BigDecimal coefficientDown; - @Schema(description = "是否包含上限") - private String isInUp; + @Schema(description = "区间方式(字典：STLM_RNG_WY)") + private String rangeWay; - @Schema(description = "是否包含下限") - private String isInDown; - - @Schema(description = "是否省内", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "是否省内不能为空") + @Schema(description = "是否省内(字典：ERP_CTRT_YN)") private String inState; - @Schema(description = "类型", example = "1") + @Schema(description = "类型(字典：STLM_COEF)", example = "1") private String type; + + @Schema(description = "系数值") + private BigDecimal settlementCoefficient; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractCoefficientDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractCoefficientDO.java index c945db3..3e3a4e9 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractCoefficientDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractCoefficientDO.java @@ -29,11 +29,6 @@ public class ContractCoefficientDO extends BusinessBaseDO { */ @TableId(type = IdType.ASSIGN_ID) private Long id; - /** - * 配置主键 - */ - @TableField("PRM_ID") - private Long parameterId; /** * 条款主键 */ @@ -54,11 +49,6 @@ public class ContractCoefficientDO extends BusinessBaseDO { */ @TableField("ELEM_NAME") private String elementName; - /** - * 系数值 - */ - @TableField("STLM_COEF") - private String settlementCoefficient; /** * 系数上限 */ @@ -70,23 +60,23 @@ public class ContractCoefficientDO extends BusinessBaseDO { @TableField("COEF_DOWN") private BigDecimal coefficientDown; /** - * 是否包含上限 + * 区间方式(字典：STLM_RNG_WY) */ - @TableField("IS_IN_UP") - private String isInUp; + @TableField("RNG_WY") + private String rangeWay; /** - * 是否包含下限 - */ - @TableField("IS_IN_DOWN") - private String isInDown; - /** - * 是否省内 + * 是否省内(字典：ERP_CTRT_YN) */ @TableField("IN_STA") private String inState; /** - * 类型 + * 类型(字典：STLM_COEF) */ @TableField("TP") private String type; + /** + * 系数值 + */ + @TableField("STLM_COEF") + private BigDecimal settlementCoefficient; } \ No newline at end of file