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 73f2e1a6..ff20aafa 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 @@ -172,6 +172,21 @@ public class ErpContractInfo extends TenantEntity { */ private Long warrantyPeriod; + /** + * 质保期描述 + */ + private String warrantyPeriodDescription; + + /** + * 交货地点 + */ + private String deliveryLocation; + + /** + * 运输方式 + */ + private String shipMethod; + /** * 合同税率(预留) */ 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 17ebaed4..e201f53a 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 @@ -175,6 +175,21 @@ public class ErpContractInfoBo extends BaseEntity { */ private Long warrantyPeriod; + /** + * 质保期描述 + */ + private String warrantyPeriodDescription; + + /** + * 交货地点 + */ + private String deliveryLocation; + + /** + * 运输方式 + */ + private String shipMethod; + /** * 合同税率(预留) */ 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 dfe0eaf3..f862c69f 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 @@ -220,6 +220,24 @@ public class ErpContractInfoVo implements Serializable { @ExcelDictFormat(readConverterExp = "天=") private Long warrantyPeriod; + /** + * 质保期描述 + */ + @ExcelProperty(value = "质保期描述") + private String warrantyPeriodDescription; + + /** + * 交货地点 + */ + @ExcelProperty(value = "交货地点") + private String deliveryLocation; + + /** + * 运输方式 + */ + @ExcelProperty(value = "运输方式") + private String shipMethod; + /** * 合同税率(预留) */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml index 9860f767..6759bedb 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml @@ -37,6 +37,9 @@ t.order_contract_code, t.project_contract_code, t.warranty_period, + t.warranty_period_description, + t.delivery_location, + t.ship_method, t.tax_rate, t.remark, t.signing_place,