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 3f60aa9e..64af4f15 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 @@ -80,6 +80,51 @@ public class ErpContractChangeInfo extends TenantEntity { */ private Date contractDate; + /** + * 合同属地标识(1中国大陆 2其他) + */ + private String contractTerritorialFlag; + + /** + * 合同属地国家/地区(字典) + */ + private String contractTerritorialCountry; + + /** + * 结算币种(CNY/USD/EUR) + */ + private String settlementCurrency; + + /** + * 对人民币汇率 + */ + private BigDecimal rmbExchangeRate; + + /** + * 已生效客户订单标识(1是 0否) + */ + private String effectiveCustomerOrderFlag; + + /** + * 合同状态(1暂存 2审批中 3可用) + */ + private String contractStatus; + + /** + * 是否关联框架合同(1是 0否) + */ + private String isFrameworkContract; + + /** + * 关联框架合同ID + */ + private Long frameworkContractId; + + /** + * 框架合同有效期 + */ + private Date frameworkValidPeriod; + /** * 合同总价 */ 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 a52291bb..0f4ddd19 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 @@ -73,7 +73,7 @@ public class ErpContractInfo extends TenantEntity { private Long contractDeptId; /** - * 合同时间 + * 合同签订日期 */ private Date contractDate; 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 b77f4404..987a3f76 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 @@ -78,6 +78,51 @@ public class ErpContractChangeInfoBo extends BaseEntity { */ private Date contractDate; + /** + * 合同属地标识(1中国大陆 2其他) + */ + private String contractTerritorialFlag; + + /** + * 合同属地国家/地区(字典) + */ + private String contractTerritorialCountry; + + /** + * 结算币种(CNY/USD/EUR) + */ + private String settlementCurrency; + + /** + * 对人民币汇率 + */ + private BigDecimal rmbExchangeRate; + + /** + * 已生效客户订单标识(1是 0否) + */ + private String effectiveCustomerOrderFlag; + + /** + * 合同状态(1暂存 2审批中 3可用) + */ + private String contractStatus; + + /** + * 是否关联框架合同(1是 0否) + */ + private String isFrameworkContract; + + /** + * 关联框架合同ID + */ + private Long frameworkContractId; + + /** + * 框架合同有效期 + */ + private Date frameworkValidPeriod; + /** * 合同总价 */ 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 d105c7db..462d4d1e 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 @@ -76,7 +76,7 @@ public class ErpContractInfoBo extends BaseEntity { private Long contractDeptId; /** - * 合同时间 + * 合同签订日期 */ private Date contractDate; 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 e87cc78a..1a088319 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 @@ -13,9 +13,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; - - /** * 合同变更信息视图对象 erp_contract_change_info @@ -97,6 +94,60 @@ public class ErpContractChangeInfoVo implements Serializable { @ExcelProperty(value = "合同签订日期") private Date contractDate; + /** + * 合同属地标识(1中国大陆 2其他) + */ + @ExcelProperty(value = "合同属地标识") + private String contractTerritorialFlag; + + /** + * 合同属地国家/地区(字典) + */ + @ExcelProperty(value = "合同属地国家/地区") + private String contractTerritorialCountry; + + /** + * 结算币种 + */ + @ExcelProperty(value = "结算币种") + private String settlementCurrency; + + /** + * 对人民币汇率 + */ + @ExcelProperty(value = "对人民币汇率") + private BigDecimal rmbExchangeRate; + + /** + * 已生效客户订单标识(1是 0否) + */ + @ExcelProperty(value = "已生效客户订单标识") + private String effectiveCustomerOrderFlag; + + /** + * 合同状态 + */ + @ExcelProperty(value = "合同状态") + private String contractStatus; + + /** + * 是否关联框架合同(1是 0否) + */ + @ExcelProperty(value = "是否关联框架合同") + private String isFrameworkContract; + + /** + * 关联框架合同ID + */ + @ExcelProperty(value = "关联框架合同ID") + private Long frameworkContractId; + + /** + * 框架合同有效期 + */ + @ExcelProperty(value = "框架合同有效期") + private Date frameworkValidPeriod; + /** * 合同总价 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractChangeInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractChangeInfoMapper.xml index f3df388a..0473f826 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractChangeInfoMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractChangeInfoMapper.xml @@ -7,7 +7,7 @@