Merge remote-tracking branch 'origin/dev' into dev

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

@@ -32,10 +32,10 @@ public class DeductRespDTO {
     private String rangeWay;
 
     @Schema(description = "上限")
-    private String up;
+    private BigDecimal up;
 
     @Schema(description = "下限")
-    private String down;
+    private BigDecimal 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/controller/admin/contract/ContractController.java

@@ -145,8 +145,8 @@ public class ContractController implements BusinessControllerMarker {
     @PostMapping("/submit/erp")
     @Operation(summary = "提交ERP")
     @PreAuthorize("@ss.hasPermission('base:contract:erp')")
-    public CommonResult<List<String>> submitErp(@RequestBody List<Long> ids) {
-        return success(contractService.submitErp(ids));
+    public CommonResult<JSONObject> submitErp(@RequestParam("id") Long id) {
+        return success(contractService.submitErp(id));
     }
 
     @GetMapping("/list/up-not-relation")

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

@@ -38,4 +38,7 @@ public class ContractPageReqVO extends PageParam {
 
     @Schema(description = "本币金额;与ERP(HTBWBZJE)对应")
     private BigDecimal basicAmount;
+
+    @Schema(description = "合同分类(字典：SPLY_BSN_TP)")
+    private String businessType;
 }

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

@@ -31,10 +31,10 @@ public class DeductRespVO {
     private String rangeWay;
 
     @Schema(description = "上限")
-    private String up;
+    private BigDecimal up;
 
     @Schema(description = "下限")
-    private String down;
+    private BigDecimal 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/controller/admin/contract/vo/contract/DeductSaveReqVO.java

@@ -31,10 +31,10 @@ public class DeductSaveReqVO {
     private String rangeWay;
 
     @Schema(description = "上限")
-    private String up;
+    private BigDecimal up;
 
     @Schema(description = "下限")
-    private String down;
+    private BigDecimal 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/controller/admin/contract/vo/contract/RelationRespVO.java

@@ -0,0 +1,15 @@
+package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 合同关联 Response VO")
+@Data
+public class RelationRespVO {
+
+    @Schema(description = "上游主键")
+    private Long upId;
+
+    @Schema(description = "下游主键")
+    private Long downId;
+}

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

@@ -63,12 +63,12 @@ public class ContractDeductDO extends BusinessBaseDO {
      * 上限
      */
     @TableField("UP")
-    private String up;
+    private BigDecimal up;
     /**
      * 下限
      */
     @TableField("DOWN")
-    private String down;
+    private BigDecimal down;
     /**
      * 类型(字典：STLM_COEF)
      */

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractMainMapper.java

@@ -23,6 +23,7 @@ public interface ContractMainMapper extends BaseMapperX<ContractMainDO> {
                 .likeIfPresent(ContractMainDO::getPurchaseCompanyName, reqVO.getPurchaseCompanyName())
                 .eqIfPresent(ContractMainDO::getBasicAmount, reqVO.getBasicAmount())
                 .eqIfPresent(ContractMainDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(ContractMainDO::getBusinessType, reqVO.getBusinessType())
                 .orderByDesc(ContractMainDO::getCreateTime));
     }
 }

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

@@ -102,10 +102,10 @@ public interface ContractService {
     /**
      * 提交ERP
      *
-     * @param ids 合同ID集合
-     * @return
+     * @param id 合同ID
+     * @return 提交结果
      */
-    List<String> submitErp(List<Long> ids);
+    JSONObject submitErp(Long id);
 
     /**
      * 删除合同
@@ -163,6 +163,14 @@ public interface ContractService {
      */
     Boolean relation(RelationReqVo reqVo);
 
+    /**
+     * 根据合同ID获得关联合同
+     *
+     * @param id 合同ID
+     * @return 上下游合同ID
+     */
+    RelationRespVO getRelation(Long id);
+
     /**
      * 下载文件
      *