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 1a486280..3f60aa9e 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 @@ -173,7 +173,7 @@ public class ErpContractChangeInfo extends TenantEntity { /** * 发货/交货期 */ - private Long deliveryStart; + private String deliveryStart; /** * 质保期描述 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 407c27da..e87cc78a 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 @@ -209,7 +209,7 @@ public class ErpContractChangeInfoVo implements Serializable { * 发货/交货期 */ @ExcelProperty(value = "发货/交货期") - private Long deliveryStart; + private String deliveryStart; /** * 质保期描述 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java index 5556c6a8..355c41e3 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java @@ -517,7 +517,6 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { data.put("外部合同号", strVal(contractInfo.getExternalContractCode())); data.put("订单号", strVal(contractInfo.getOrderContractCode())); data.put("项目号", strVal(contractInfo.getProjectContractCode())); - // 当前业务已统一“发货/交货期”命名,保留历史键兼容旧模板占位符 String deliveryPeriod = strVal(contractInfo.getDeliveryStart()); data.put("发货/交货期", deliveryPeriod); data.put("交付启动期限", deliveryPeriod);