合同审核接口修改

合同提交审核接口修改
调整价配置对应字段修改
合同提交erp接口修改
作废接口修改
完结接口修改

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DeductRespDTO.java

@@ -16,6 +16,9 @@ public class DeductRespDTO {
     @Schema(description = "条款主键")
     private Long formulaId;
 
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+
     @Schema(description = "数据项类型(字典:GRD_CFG_TP)")
     private String configType;
 
@@ -25,6 +28,18 @@ public class DeductRespDTO {
     @Schema(description = "调整价")
     private BigDecimal gradeAmount;
 
+    @Schema(description = "区间方式(字典：STLM_RNG_WY)")
+    private String rangeWay;
+
+    @Schema(description = "上限")
+    private String up;
+
+    @Schema(description = "下限")
+    private String down;
+
+    @Schema(description = "类型(字典：STLM_COEF)")
+    private String type;
+
     @Schema(description = "创建时间")
     private LocalDateTime createTime;
 }

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

@@ -135,11 +135,10 @@ public class ContractController implements BusinessControllerMarker {
         return success(contractService.submitApproval(id));
     }
 
-    // TODO
     @PostMapping("/approval")
-    @Operation(summary = "合同审批 TODO")
+    @Operation(summary = "合同审批")
     @PreAuthorize("@ss.hasPermission('base:contract:approval')")
-    public CommonResult<String> approval(@Valid @RequestBody ApprovalReqVO reqVO) {
+    public CommonResult<Boolean> approval(@Valid @RequestBody ApprovalReqVO reqVO) {
         return success(contractService.approval(reqVO));
     }
 

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

@@ -13,11 +13,11 @@ public class ApprovalReqVO {
     @NotNull(message = "合同主键ID不能为空")
     private Long id;
 
-    @Schema(description = "审核结果(通过：PASS，驳回：REJECT)", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "审核结果不能为空")
-    private String auditResult;
-
     @Schema(description = "审批意见", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "审核意见不能为空")
     private String reviewOpinion;
+
+    @Schema(description = "状态：待推送 WAIT_PUSH，已驳回 REJECTED", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "审核状态不能为空")
+    private String status;
 }

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

@@ -15,6 +15,9 @@ public class DeductRespVO {
     @Schema(description = "条款主键")
     private Long formulaId;
 
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+
     @Schema(description = "数据项类型(字典:GRD_CFG_TP)")
     private String configType;
 
@@ -24,6 +27,18 @@ public class DeductRespVO {
     @Schema(description = "调整价")
     private BigDecimal gradeAmount;
 
+    @Schema(description = "区间方式(字典：STLM_RNG_WY)")
+    private String rangeWay;
+
+    @Schema(description = "上限")
+    private String up;
+
+    @Schema(description = "下限")
+    private String down;
+
+    @Schema(description = "类型(字典：STLM_COEF)")
+    private String type;
+
     @Schema(description = "创建时间")
     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/DeductSaveReqVO.java

@@ -15,6 +15,9 @@ public class DeductSaveReqVO {
     @Schema(description = "条款主键")
     private Long formulaId;
 
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+
     @Schema(description = "数据项类型(字典:GRD_CFG_TP)")
     private String configType;
 
@@ -23,4 +26,16 @@ public class DeductSaveReqVO {
 
     @Schema(description = "调整价")
     private BigDecimal gradeAmount;
+
+    @Schema(description = "区间方式(字典：STLM_RNG_WY)")
+    private String rangeWay;
+
+    @Schema(description = "上限")
+    private String up;
+
+    @Schema(description = "下限")
+    private String down;
+
+    @Schema(description = "类型(字典：STLM_COEF)")
+    private String type;
 }

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

@@ -34,6 +34,11 @@ public class ContractDeductDO extends BusinessBaseDO {
      */
     @TableField("FMU_ID")
     private Long formulaId;
+    /**
+     * 金属元素缩写（Cu\Au\Ag）
+     */
+    @TableField("ELEM_ABBR")
+    private String elementAbbreviation;
     /**
      * 数据项类型(字典:GRD_CFG_TP)
      */
@@ -49,4 +54,24 @@ public class ContractDeductDO extends BusinessBaseDO {
      */
     @TableField("GRD_AMT")
     private BigDecimal gradeAmount;
+    /**
+     * 区间方式(字典：STLM_RNG_WY)
+     */
+    @TableField("RNG_WY")
+    private String rangeWay;
+    /**
+     * 上限
+     */
+    @TableField("UP")
+    private String up;
+    /**
+     * 下限
+     */
+    @TableField("DOWN")
+    private String down;
+    /**
+     * 类型(字典：STLM_COEF)
+     */
+    @TableField("TP")
+    private String type;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java

@@ -64,7 +64,7 @@ public interface ContractService {
      * @param reqVO 审批信息
      * @return 审批结果
      */
-    String approval(@Valid ApprovalReqVO reqVO);
+    Boolean approval(@Valid ApprovalReqVO reqVO);
 
     /**
      * 查询不计价规则列表