From dd4e876b60ee43238bd26997d02112dcd597a831 Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 22 May 2026 15:54:29 +0800 Subject: [PATCH] =?UTF-8?q?1.1.51=20=E5=90=88=E5=90=8C=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AD=97=E7=AC=A6=E7=B1=BB=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8A=E4=BC=A0=E5=A4=9A=E4=B8=AA=E9=99=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/oa/erp/domain/ErpContractChangeInfo.java | 2 +- .../main/java/org/dromara/oa/erp/domain/ErpContractInfo.java | 4 ++-- .../org/dromara/oa/erp/domain/bo/ErpContractChangeInfoBo.java | 2 +- .../java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java | 2 +- .../org/dromara/oa/erp/domain/vo/ErpContractChangeInfoVo.java | 2 +- .../java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java | 2 +- .../oa/erp/service/impl/ErpContractOrderServiceImpl.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeInfo.java index 64af4f15..22ff0c15 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeInfo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeInfo.java @@ -188,7 +188,7 @@ public class ErpContractChangeInfo extends TenantEntity { /** * 签字合同附件 */ - private Long signatureAppendix; + private String signatureAppendix; /** * 质保期(天) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java index 0f4ddd19..ed28a571 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java @@ -173,9 +173,9 @@ public class ErpContractInfo extends TenantEntity { private String paymentMethod; /** - * 签字合同附件 + * 签字合同附件（多个 OSS ID，逗号分隔） */ - private Long signatureAppendix; + private String signatureAppendix; /** * 海威SAP订单号 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeInfoBo.java index 987a3f76..06b777d1 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeInfoBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeInfoBo.java @@ -186,7 +186,7 @@ public class ErpContractChangeInfoBo extends BaseEntity { /** * 签字合同附件 */ - private Long signatureAppendix; + private String signatureAppendix; /** * 质保期(天) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java index 462d4d1e..defea538 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java @@ -183,7 +183,7 @@ public class ErpContractInfoBo extends BaseEntity { /** * 签字合同附件 */ - private Long signatureAppendix; + private String signatureAppendix; /** * 海威SAP订单号 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeInfoVo.java index 1a088319..213dbe13 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeInfoVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeInfoVo.java @@ -224,7 +224,7 @@ public class ErpContractChangeInfoVo implements Serializable { * 签字合同附件 */ @ExcelProperty(value = "签字合同附件") - private Long signatureAppendix; + private String signatureAppendix; /** * 质保期(天) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java index 8d7f1b01..a7ecb5a4 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java @@ -238,7 +238,7 @@ public class ErpContractInfoVo implements Serializable { * 签字合同附件 */ @ExcelProperty(value = "签字合同附件") - private Long signatureAppendix; + private String signatureAppendix; /** * 海威SAP订单号 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java index fee1fedc..ff7e6df5 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java @@ -316,7 +316,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { // 上传终版合同时：激活合同并校验甲方客户资料 if (StringUtils.isNotBlank(bo.getOssId())) { validPartyACustomerForOrderActivate(contractInfoVo.getOneCustomerId()); - contractPatch.setSignatureAppendix(Convert.toLong(bo.getOssId().trim())); + contractPatch.setSignatureAppendix(bo.getOssId().trim()); // contractPatch.setContractDeptId(bo.getDeptId()); contractPatch.setContractStatus(OAStatusEnum.ACTIVATE.getStatus()); }