From 22ddb3356491ac14438f3dd3df69463bf81c0ebf Mon Sep 17 00:00:00 2001 From: guojunyun Date: Sat, 11 Oct 2025 09:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=81=E4=BD=8D=E7=AD=89=E7=BA=A7=E4=BB=B7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/vo/contract/GradeRespVO.java | 36 ++++++++++--------- .../contract/vo/contract/GradeSaveReqVO.java | 34 ++++++++---------- .../dataobject/contract/ContractGradeDO.java | 31 +++++++--------- 3 files changed, 47 insertions(+), 54 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/GradeRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeRespVO.java index 3662dca..c698dc5 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeRespVO.java @@ -1,19 +1,19 @@ package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDateTime; @Schema(description = "管理后台 - 品位等级价配置 Response VO") @Data public class GradeRespVO { - @Schema(description = "主键") - private Long id; - @Schema(description = "配置主键") - private Long parameterId; + @Schema(description = "主键") + @ExcelProperty("主键") + private Long id; @Schema(description = "条款主键") private Long formulaId; @@ -36,28 +36,30 @@ public class GradeRespVO { @Schema(description = "品位下限") private BigDecimal gradeDown; - @Schema(description = "是否包含上限;包含则是大于等于，不包含则是大于") - private String isInUp; + @Schema(description = "区间方式(字典:STLM_RNG_WY)") + private String rangeWay; - @Schema(description = "是否包含下限;包含则是小于等于，不包含则是小于") - private String isInDown; - - @Schema(description = "默认计价品位;计价方式为加时，默认为为下限，计价方式为减时，默认为为上限，可手动填写") + @Schema(description = "默认计价品位") private BigDecimal gradeDefault; - @Schema(description = "系数;计价类型为阶梯价使用，标识没上升多少系数进行加款还是减款") + @Schema(description = "系数值") private BigDecimal settlementCoefficient; - @Schema(description = "不足系数值按比例计算") + @Schema(description = "是否比例计算(字典:ERP_CTRT_YN)") private String useCoefficient; - @Schema(description = "计价类型") + @Schema(description = "计价类型(字典:STLM_GRD_TP)") private String priceType; - @Schema(description = "是否省内") - @NotEmpty(message = "是否省内不能为空") + @Schema(description = "是否省内(字典:ERP_CTRT_YN)") private String inState; - @Schema(description = "等级单价") + @Schema(description = "等级单价", example = "3565") private BigDecimal unitPrice; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "数据项类型(字典:GRD_CFG_TP)") + private String configType; } 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/GradeSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeSaveReqVO.java index 9c67968..3dbc60f 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeSaveReqVO.java @@ -1,21 +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 lombok.Data; + import java.math.BigDecimal; @Schema(description = "管理后台 - 品位等级价配置新增/修改 Request VO") @Data public class GradeSaveReqVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15414") + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "6211") private Long id; - @Schema(description = "配置主键", example = "16734") - private Long parameterId; - - @Schema(description = "条款主键", example = "15344") + @Schema(description = "条款主键", example = "2426") private Long formulaId; @Schema(description = "金属元素编码") @@ -24,7 +21,7 @@ public class GradeSaveReqVO { @Schema(description = "金属元素缩写") private String elementAbbreviation; - @Schema(description = "金属元素名称", example = "芋艿") + @Schema(description = "金属元素名称", example = "王五") private String elementName; @Schema(description = "品位单位") @@ -36,28 +33,27 @@ public class GradeSaveReqVO { @Schema(description = "品位下限") private BigDecimal gradeDown; - @Schema(description = "是否包含上限;包含则是大于等于，不包含则是大于") - private String isInUp; + @Schema(description = "区间方式(字典:STLM_RNG_WY)") + private String rangeWay; - @Schema(description = "是否包含下限;包含则是小于等于，不包含则是小于") - private String isInDown; - - @Schema(description = "默认计价品位;计价方式为加时，默认为为下限，计价方式为减时，默认为为上限，可手动填写") + @Schema(description = "默认计价品位") private BigDecimal gradeDefault; - @Schema(description = "系数;计价类型为阶梯价使用，标识没上升多少系数进行加款还是减款") + @Schema(description = "系数值") private BigDecimal settlementCoefficient; - @Schema(description = "不足系数值按比例计算") + @Schema(description = "是否比例计算(字典:ERP_CTRT_YN)") private String useCoefficient; - @Schema(description = "计价类型", example = "2") + @Schema(description = "计价类型(字典:STLM_GRD_TP)", example = "2") private String priceType; - @Schema(description = "是否省内", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "是否省内不能为空") + @Schema(description = "是否省内(字典:ERP_CTRT_YN)") private String inState; - @Schema(description = "等级单价", example = "26237") + @Schema(description = "等级单价", example = "3565") private BigDecimal unitPrice; + + @Schema(description = "数据项类型(字典:GRD_CFG_TP)", example = "1") + private String configType; } \ 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/ContractGradeDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractGradeDO.java index 47403a4..0c9c9dc 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractGradeDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractGradeDO.java @@ -29,11 +29,6 @@ public class ContractGradeDO extends BusinessBaseDO { */ @TableId(type = IdType.ASSIGN_ID) private Long id; - /** - * 配置主键 - */ - @TableField("PRM_ID") - private Long parameterId; /** * 条款主键 */ @@ -70,37 +65,32 @@ public class ContractGradeDO extends BusinessBaseDO { @TableField("GRD_DOWN") private BigDecimal gradeDown; /** - * 是否包含上限;包含则是大于等于，不包含则是大于 + * 区间方式(字典:STLM_RNG_WY) */ - @TableField("IS_IN_UP") - private String isInUp; + @TableField("RNG_WY") + private String rangeWay; /** - * 是否包含下限;包含则是小于等于，不包含则是小于 - */ - @TableField("IS_IN_DOWN") - private String isInDown; - /** - * 默认计价品位;计价方式为加时，默认为为下限，计价方式为减时，默认为为上限，可手动填写 + * 默认计价品位 */ @TableField("GRD_DFT") private BigDecimal gradeDefault; /** - * 系数;计价类型为阶梯价使用，标识没上升多少系数进行加款还是减款 + * 系数值 */ @TableField("STLM_COEF") private BigDecimal settlementCoefficient; /** - * 不足系数值按比例计算 + * 是否比例计算(字典:ERP_CTRT_YN) */ @TableField("USE_COEF") private String useCoefficient; /** - * 计价类型 + * 计价类型(字典:STLM_GRD_TP) */ @TableField("PRC_TP") private String priceType; /** - * 是否省内 + * 是否省内(字典:ERP_CTRT_YN) */ @TableField("IN_STA") private String inState; @@ -109,4 +99,9 @@ public class ContractGradeDO extends BusinessBaseDO { */ @TableField("UPRC") private BigDecimal unitPrice; + /** + * 数据项类型(字典:GRD_CFG_TP) + */ + @TableField("CFG_TP") + private String configType; } \ No newline at end of file