合同数据结构修改

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/TableFieldConstants.java

@@ -118,9 +118,13 @@ public class TableFieldConstants {
     // 条款主键
     public static final String BSE_CTRT_PRC_FMU_ID = "FMU_ID";
 
+    /* 参数降级规则表 */
+    // 合同主键
+    public static final String BSE_CTRT_DMOT_CTRT_ID = "CTRT_ID";
+
     /* 品位不计价配置表 */
-    // 条款主键
-    public static final String BSE_CTRT_NT_FMU_ID = "FMU_ID";
+    // 合同主键
+    public static final String BSE_CTRT_NT_CTRT_ID = "CTRT_ID";
 
     /* 实例字段值表 */
     // 关联实例主键

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractDemoteSaveReqVO.java

@@ -0,0 +1,43 @@
+package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - 参数降级规则新增/修改 Request VO")
+@Data
+public class ContractDemoteSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31818")
+    private Long id;
+
+    @Schema(description = "合同主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14971")
+    @NotNull(message = "合同主键不能为空")
+    private Long contractId;
+
+    @Schema(description = "金属元素编码")
+    private String elementNumber;
+
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+
+    @Schema(description = "金属元素名称", example = "王五")
+    private String elementName;
+
+    @Schema(description = "上限")
+    private BigDecimal gradeUp;
+
+    @Schema(description = "区间方式(字典：STLM_RNG_WY)")
+    private String rangeWay;
+
+    @Schema(description = "下限")
+    private BigDecimal gradeDown;
+
+    @Schema(description = "降级后物料名称", example = "李四")
+    private String materialName;
+
+    @Schema(description = "降级后物料编码")
+    private String materialNumber;
+}

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractFormulaSaveReqVO.java

@@ -55,6 +55,4 @@ public class ContractFormulaSaveReqVO {
     private List<ContractDeductSaveReqVO> deducts;
     // 市场价配置
     private List<ContractPriceSaveReqVO> prices;
-    // 品位不计价配置
-    private List<ContractNotSaveReqVO> nots;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractNotSaveReqVO.java

@@ -1,24 +1,21 @@
 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")
+@Schema(description = "管理后台 - 品位不计价规则新增/修改 Request VO")
 @Data
 public class ContractNotSaveReqVO {
 
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "21132")
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "18545")
     private Long id;
 
-    @Schema(description = "配置主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "3781")
-    @NotNull(message = "配置主键不能为空")
-    private Long parameterId;
-
-    @Schema(description = "条款主键", example = "5722")
-    private Long formulaId;
+    @Schema(description = "合同主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "5333")
+    @NotNull(message = "合同主键不能为空")
+    private Long contractId;
 
     @Schema(description = "金属元素编码")
     private String elementNumber;
@@ -26,23 +23,21 @@ public class ContractNotSaveReqVO {
     @Schema(description = "金属元素缩写")
     private String elementAbbreviation;
 
-    @Schema(description = "金属元素名称", example = "张三")
+    @Schema(description = "金属元素名称", example = "王五")
     private String elementName;
 
-    @Schema(description = "上限", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "上限不能为空")
+    @Schema(description = "上限")
     private BigDecimal gradeUp;
 
     @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 = "物料名称", example = "芋艿")
+    private String materialName;
 
-    @Schema(description = "是否省内", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "是否省内不能为空")
-    private String inState;
+    @Schema(description = "物料编码")
+    private String materialNumber;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractSaveReqVO.java

@@ -217,4 +217,10 @@ public class ContractSaveReqVO {
 
     // 价款结算条款
     private List<ContractFormulaSaveReqVO> formulas;
+
+    // 参数降级规则
+    private List<ContractDemoteSaveReqVO> demotes;
+
+    // 品位不计价配置
+    private List<ContractNotSaveReqVO> nots;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewDemoteRespVO.java

@@ -0,0 +1,59 @@
+package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 参数降级规则 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ContractViewDemoteRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31818")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "合同主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14971")
+    @ExcelProperty("合同主键")
+    private Long contractId;
+
+    @Schema(description = "金属元素编码")
+    @ExcelProperty("金属元素编码")
+    private String elementNumber;
+
+    @Schema(description = "金属元素缩写")
+    @ExcelProperty("金属元素缩写")
+    private String elementAbbreviation;
+
+    @Schema(description = "金属元素名称", example = "王五")
+    @ExcelProperty("金属元素名称")
+    private String elementName;
+
+    @Schema(description = "上限")
+    @ExcelProperty("上限")
+    private BigDecimal gradeUp;
+
+    @Schema(description = "区间方式(字典：STLM_RNG_WY)")
+    @ExcelProperty("区间方式(字典：STLM_RNG_WY)")
+    private String rangeWay;
+
+    @Schema(description = "下限")
+    @ExcelProperty("下限")
+    private BigDecimal gradeDown;
+
+    @Schema(description = "降级后物料名称", example = "李四")
+    @ExcelProperty("降级后物料名称")
+    private String materialName;
+
+    @Schema(description = "降级后物料编码")
+    @ExcelProperty("降级后物料编码")
+    private String materialNumber;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+}

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewFormulaRespVO.java

@@ -52,6 +52,4 @@ public class ContractViewFormulaRespVO {
     private List<ContractViewDeductRespVO> deducts;
     // 市场价配置
     private List<ContractViewPriceRespVO> prices;
-    // 品位不计价配置
-    private List<ContractViewNotRespVO> nots;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewNotRespVO.java

@@ -1,48 +1,59 @@
 package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 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;
+import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 品位不计价配置 Response VO")
+@Schema(description = "管理后台 - 品位不计价规则 Response VO")
 @Data
+@ExcelIgnoreUnannotated
 public class ContractViewNotRespVO {
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "21132")
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "18545")
+    @ExcelProperty("主键")
     private Long id;
 
-    @Schema(description = "配置主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "3781")
-    @NotNull(message = "配置主键不能为空")
-    private Long parameterId;
-
-    @Schema(description = "条款主键", example = "5722")
-    private Long formulaId;
+    @Schema(description = "合同主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "5333")
+    @ExcelProperty("合同主键")
+    private Long contractId;
 
     @Schema(description = "金属元素编码")
+    @ExcelProperty("金属元素编码")
     private String elementNumber;
 
     @Schema(description = "金属元素缩写")
+    @ExcelProperty("金属元素缩写")
     private String elementAbbreviation;
 
-    @Schema(description = "金属元素名称", example = "张三")
+    @Schema(description = "金属元素名称", example = "王五")
+    @ExcelProperty("金属元素名称")
     private String elementName;
 
-    @Schema(description = "上限", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "上限不能为空")
+    @Schema(description = "上限")
+    @ExcelProperty("上限")
     private BigDecimal gradeUp;
 
     @Schema(description = "下限")
+    @ExcelProperty("下限")
     private BigDecimal gradeDown;
 
-    @Schema(description = "是否包含上限")
-    private String isInUp;
+    @Schema(description = "区间方式(字典：STLM_RNG_WY)")
+    @ExcelProperty("区间方式(字典：STLM_RNG_WY)")
+    private String rangeWay;
 
-    @Schema(description = "是否包含下限")
-    private String isInDown;
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
 
-    @Schema(description = "是否省内", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "是否省内不能为空")
-    private String inState;
-}
+    @Schema(description = "物料名称", example = "芋艿")
+    @ExcelProperty("物料名称")
+    private String materialName;
+
+    @Schema(description = "物料编码")
+    @ExcelProperty("物料编码")
+    private String materialNumber;
+}

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewRespVO.java

@@ -303,4 +303,10 @@ public class ContractViewRespVO {
 
     // 价款结算条款
     private List<ContractViewFormulaRespVO> formulas;
+
+    // 参数降级规则
+    private List<ContractViewDemoteRespVO> demotes;
+
+    // 品位不计价配置
+    private List<ContractViewNotRespVO> nots;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDemoteDO.java

@@ -0,0 +1,77 @@
+package com.zt.plat.module.contractorder.dal.dataobject.contract;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * 参数降级规则 DO
+ *
+ * @author 后台管理-1
+ */
+@TableName("bse_ctrt_dmot")
+@KeySequence("bse_ctrt_dmot_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+ * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+ */
+public class ContractDemoteDO extends BusinessBaseDO {
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 合同主键
+     */
+    @TableField("CTRT_ID")
+    private Long contractId;
+    /**
+     * 金属元素编码
+     */
+    @TableField("ELEM_NUM")
+    private String elementNumber;
+    /**
+     * 金属元素缩写
+     */
+    @TableField("ELEM_ABBR")
+    private String elementAbbreviation;
+    /**
+     * 金属元素名称
+     */
+    @TableField("ELEM_NAME")
+    private String elementName;
+    /**
+     * 上限
+     */
+    @TableField("GRD_UP")
+    private BigDecimal gradeUp;
+    /**
+     * 区间方式(字典：STLM_RNG_WY)
+     */
+    @TableField("RNG_WY")
+    private String rangeWay;
+    /**
+     * 下限
+     */
+    @TableField("GRD_DOWN")
+    private BigDecimal gradeDown;
+    /**
+     * 降级后物料名称
+     */
+    @TableField("MTRL_NAME")
+    private String materialName;
+    /**
+     * 降级后物料编码
+     */
+    @TableField("MTRL_NUM")
+    private String materialNumber;
+}